Move fontNormal flag from Key to Row

Change-Id: I250da7c82e005ffe2027c528a1df731a1a3cdf47

1 files changed, 36 insertions, 56 deletions

diff --git a/java/res/xml/rowkeys_lao3.xml b/java/res/xml/rowkeys_lao3.xml
index 172716dde..ab3e25131 100644
--- a/java/res/xml/rowkeys_lao3.xml
+++ b/java/res/xml/rowkeys_lao3.xml
@@ -18,93 +18,73 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0EB1/U+0EC9: "ັ້" LAO VOWEL SIGN MAI KAN/LAO TONE MAI THO -->
             <Key
                 latin:keySpec="&#x0EB1;&#x0EC9;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <Key
-                latin:keySpec=";" />
+                latin:keySpec=";"
+                latin:keyLabelFlags="fontDefault" />
             <Key
-                latin:keySpec="." />
+                latin:keySpec="."
+                latin:keyLabelFlags="fontDefault" />
             <Key
-                latin:keySpec="," />
+                latin:keySpec=","
+                latin:keyLabelFlags="fontDefault" />
             <Key
-                latin:keySpec=":" />
+                latin:keySpec=":"
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+0ECA: "໊" LAO TONE MAI TI -->
-            <Key
-                latin:keySpec="&#x0ECA;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ECA;" />
             <!-- U+0ECB: "໋" LAO TONE MAI CATAWA -->
+            <Key latin:keySpec="&#x0ECB;" />
             <Key
-                latin:keySpec="&#x0ECB;"
-                latin:keyLabelFlags="fontNormal" />
-            <Key
-                latin:keySpec="!" />
+                latin:keySpec="!"
+                latin:keyLabelFlags="fontDefault" />
             <Key
-                latin:keySpec="\?" />
+                latin:keySpec="\?"
+                latin:keyLabelFlags="fontDefault" />
             <Key
-                latin:keySpec="%" />
+                latin:keySpec="%"
+                latin:keyLabelFlags="fontDefault" />
             <Key
-                latin:keySpec="=" />
+                latin:keySpec="="
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+201C: "“" LEFT DOUBLE QUOTATION MARK -->
             <Key
-                latin:keySpec="&#x201C;" />
+                latin:keySpec="&#x201C;"
+                latin:keyLabelFlags="fontDefault" />
         </case>
         <default>
             <!-- U+0EB1: "ັ" LAO VOWEL SIGN MAI KAN -->
-            <Key
-                latin:keySpec="&#x0EB1;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EB1;" />
             <!-- U+0EAB: "ຫ" LAO LETTER HO SUNG -->
-            <Key
-                latin:keySpec="&#x0EAB;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EAB;" />
             <!-- U+0E81: "ກ" LAO LETTER KO -->
-            <Key
-                latin:keySpec="&#x0E81;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E81;" />
             <!-- U+0E94: "ດ" LAO LETTER DO -->
-            <Key
-                latin:keySpec="&#x0E94;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E94;" />
             <!-- U+0EC0: "ເ" LAO VOWEL SIGN E -->
-            <Key
-                latin:keySpec="&#x0EC0;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EC0;" />
             <!-- U+0EC9: "້" LAO TONE MAI THO -->
-            <Key
-                latin:keySpec="&#x0EC9;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EC9;" />
             <!-- U+0EC8: "່" LAO TONE MAI EK -->
-            <Key
-                latin:keySpec="&#x0EC8;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EC8;" />
             <!-- U+0EB2: "າ" LAO VOWEL SIGN AA -->
-            <Key
-                latin:keySpec="&#x0EB2;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EB2;" />
             <!-- U+0EAA: "ສ" LAO LETTER SO SUNG -->
-            <Key
-                latin:keySpec="&#x0EAA;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EAA;" />
             <!-- U+0EA7: "ວ" LAO LETTER WO -->
-            <Key
-                latin:keySpec="&#x0EA7;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EA7;" />
             <!-- U+0E87: "ງ" LAO LETTER NGO -->
-            <Key
-                latin:keySpec="&#x0E87;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E87;" />
             <!-- U+201C: "“" LEFT DOUBLE QUOTATION MARK -->
             <Key
-                latin:keySpec="&#x201C;" />
+                latin:keySpec="&#x201C;"
+                latin:keyLabelFlags="fontDefault" />
         </default>
     </switch>
 </merge>