Move fontNormal flag from Key to Row

Change-Id: I250da7c82e005ffe2027c528a1df731a1a3cdf47
diff --git a/java/res/xml/rowkeys_myanmar1.xml b/java/res/xml/rowkeys_myanmar1.xml
index b7c8209..1170074 100644
--- a/java/res/xml/rowkeys_myanmar1.xml
+++ b/java/res/xml/rowkeys_myanmar1.xml
@@ -18,116 +18,88 @@
 */
 -->
 
-<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+1027: "ဧ" MYANMAR LETTER E -->
-            <Key
-                latin:keySpec="&#x1027;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1027;" />
             <!-- U+104F: "၏" MYANMAR SYMBOL GENITIVE -->
-            <Key
-                latin:keySpec="&#x104F;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x104F;" />
             <!-- U+1024: "ဤ" MYANMAR LETTER II -->
-            <Key
-                latin:keySpec="&#x1024;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1024;" />
             <!-- U+1023: "ဣ" MYANMAR LETTER I -->
-            <Key
-                latin:keySpec="&#x1023;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1023;" />
             <!-- U+104E: "၎" MYANMAR SYMBOL AFOREMENTIONED -->
-            <Key
-                latin:keySpec="&#x104E;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x104E;" />
             <!-- U+1000/U+103B/U+1015/U+103A: "ကျပ်"
                  MYANMAR LETTER KA/MYANMAR CONSONANT SIGN MEDIAL YA/MYANMAR LETTER PA/MYANMAR SIGN ASAT -->
             <Key
                 latin:keySpec="&#x1000;&#x103B;&#x1015;&#x103A;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio|autoScale" />
+                latin:keyLabelFlags="followKeyLetterRatio|autoScale" />
             <!-- U+1029: "ဩ" MYANMAR LETTER O -->
             <Key
                 latin:keySpec="&#x1029;"
-                latin:keyLabelFlags="fontNormal|autoScale" />
+                latin:keyLabelFlags="autoScale" />
             <!-- U+102A: "ဪ" MYANMAR LETTER AU -->
             <Key
                 latin:keySpec="&#x102A;"
-                latin:keyLabelFlags="fontNormal|autoScale" />
+                latin:keyLabelFlags="autoScale" />
             <!-- U+104D: "၍" MYANMAR SYMBOL COMPLETED -->
-            <Key
-                latin:keySpec="&#x104D;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x104D;" />
             <!-- U+104C: "၌" MYANMAR SYMBOL LOCATIVE -->
-            <Key
-                latin:keySpec="&#x104C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x104C;" />
         </case>
         <default>
             <!-- U+1041: "၁" MYANMAR DIGIT ONE -->
             <Key
                 latin:keySpec="&#x1041;"
                 latin:keyHintLabel="1"
-                latin:additionalMoreKeys="1"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="1" />
             <!-- U+1042: "၂" MYANMAR DIGIT TWO -->
             <Key
                 latin:keySpec="&#x1042;"
                 latin:keyHintLabel="2"
-                latin:additionalMoreKeys="2"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="2" />
             <!-- U+1043: "၃" MYANMAR DIGIT THREE -->
             <Key
                 latin:keySpec="&#x1043;"
                 latin:keyHintLabel="3"
-                latin:additionalMoreKeys="3"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="3" />
             <!-- U+1044: "၄" MYANMAR DIGIT FOUR -->
             <Key
                 latin:keySpec="&#x1044;"
                 latin:keyHintLabel="4"
-                latin:additionalMoreKeys="4"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="4" />
             <!-- U+1045: "၅" MYANMAR DIGIT FIVE -->
             <Key
                 latin:keySpec="&#x1045;"
                 latin:keyHintLabel="5"
-                latin:additionalMoreKeys="5"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="5" />
             <!-- U+1046: "၆" MYANMAR DIGIT SIX -->
             <Key
                 latin:keySpec="&#x1046;"
                 latin:keyHintLabel="6"
-                latin:additionalMoreKeys="6"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="6" />
             <!-- U+1047: "၇" MYANMAR DIGIT SEVEN -->
             <Key
                 latin:keySpec="&#x1047;"
                 latin:keyHintLabel="7"
-                latin:additionalMoreKeys="7"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="7" />
             <!-- U+1048: "၈" MYANMAR DIGIT EIGHT -->
             <Key
                 latin:keySpec="&#x1048;"
                 latin:keyHintLabel="8"
-                latin:additionalMoreKeys="8"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="8" />
             <!-- U+1049: "၉" MYANMAR DIGIT NINE -->
             <Key
                 latin:keySpec="&#x1049;"
                 latin:keyHintLabel="9"
-                latin:additionalMoreKeys="9"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="9" />
             <!-- U+1040: "၀" MYANMAR DIGIT ZERO -->
             <Key
                 latin:keySpec="&#x1040;"
                 latin:keyHintLabel="0"
-                latin:additionalMoreKeys="0"
-                latin:keyLabelFlags="fontNormal" />
+                latin:additionalMoreKeys="0" />
         </default>
     </switch>
 </merge>