Move fontNormal flag from Key to Row

Change-Id: I250da7c82e005ffe2027c528a1df731a1a3cdf47
diff --git a/java/res/xml/rowkeys_lao4.xml b/java/res/xml/rowkeys_lao4.xml
index ed4b9b1..5beb1cb 100644
--- a/java/res/xml/rowkeys_lao4.xml
+++ b/java/res/xml/rowkeys_lao4.xml
@@ -18,86 +18,60 @@
 */
 -->
 
-<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+20AD: "₭" KIP SIGN -->
             <Key
-                latin:keySpec="&#x20AD;" />
+                latin:keySpec="&#x20AD;"
+                latin:keyLabelFlags="fontDefault" />
             <Key
-                latin:keySpec="(" />
-            <!-- U+0EAF: "ຯ" LAO ELLIPSIS -->
+                latin:keySpec="("
+                latin:keyLabelFlags="fontDefault" />
+            <Key latin:keySpec="&#x0EAF;" />
             <Key
-                latin:keySpec="&#x0EAF;"
-                latin:keyLabelFlags="fontNormal" />
-            <Key
-                latin:keySpec="\@" />
+                latin:keySpec="\@"
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+0EB6/U+0EC9: "ຶ້" LAO VOWEL SIGN Y/LAO TONE MAI THO -->
             <Key
                 latin:keySpec="&#x0EB6;&#x0EC9;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0EB7/U+0EC9: "ື້" LAO VOWEL SIGN YY/LAO TONE MAI THO -->
             <Key
                 latin:keySpec="&#x0EB7;&#x0EC9;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0EC6: "ໆ" LAO KO LA -->
-            <Key
-                latin:keySpec="&#x0EC6;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EC6;" />
             <!-- U+0EDD: "ໝ" LAO HO MO -->
+            <Key latin:keySpec="&#x0EDD;" />
             <Key
-                latin:keySpec="&#x0EDD;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:keySpec="$"
+                latin:keyLabelFlags="fontDefault" />
             <Key
-                latin:keySpec="$" />
-            <Key
-                latin:keySpec=")" />
+                latin:keySpec=")"
+                latin:keyLabelFlags="fontDefault" />
         </case>
         <default>
             <!-- U+0E9C: "ຜ" LAO LETTER PHO SUNG -->
-            <Key
-                latin:keySpec="&#x0E9C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E9C;" />
             <!-- U+0E9B: "ປ" LAO LETTER PO -->
-            <Key
-                latin:keySpec="&#x0E9B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E9B;" />
             <!-- U+0EC1: "ແ" LAO VOWEL SIGN EI -->
-            <Key
-                latin:keySpec="&#x0EC1;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EC1;" />
             <!-- U+0EAD: "ອ" LAO LETTER O -->
-            <Key
-                latin:keySpec="&#x0EAD;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EAD;" />
             <!-- U+0EB6: "ຶ" LAO VOWEL SIGN Y -->
-            <Key
-                latin:keySpec="&#x0EB6;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EB6;" />
             <!-- U+0EB7: "ື" LAO VOWEL SIGN YY -->
-            <Key
-                latin:keySpec="&#x0EB7;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EB7;" />
             <!-- U+0E97: "ທ" LAO LETTER THO TAM -->
-            <Key
-                latin:keySpec="&#x0E97;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E97;" />
             <!-- U+0EA1: "ມ" LAO LETTER MO -->
-            <Key
-                latin:keySpec="&#x0EA1;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EA1;" />
             <!-- U+0EC3: "ໃ" LAO VOWEL SIGN AY -->
-            <Key
-                latin:keySpec="&#x0EC3;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EC3;" />
             <!-- U+0E9D: "ຝ" LAO LETTER FO TAM -->
-            <Key
-                latin:keySpec="&#x0E9D;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E9D;" />
         </default>
     </switch>
 </merge>