Move fontNormal flag from Key to Row

Change-Id: I250da7c82e005ffe2027c528a1df731a1a3cdf47
diff --git a/java/res/xml/rowkeys_myanmar3.xml b/java/res/xml/rowkeys_myanmar3.xml
index 612bcd3..c585068 100644
--- a/java/res/xml/rowkeys_myanmar3.xml
+++ b/java/res/xml/rowkeys_myanmar3.xml
@@ -18,106 +18,69 @@
 */
 -->
 
-<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+101A: "ယ" MYANMAR LETTER YA -->
-            <Key
-                latin:keySpec="&#x101A;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x101A;" />
             <!-- U+1039: "္" MYANMAR SIGN VIRAMA -->
-            <Key
-                latin:keySpec="&#x1039;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1039;" />
             <!-- U+1004/U+103A/U+1039: "င်္င" MYANMAR LETTER NGA/MYANMAR SIGN ASAT/MYANMAR SIGN VIRAMA -->
             <Key
                 latin:keySpec="&#x1004;&#x103A;&#x1039;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+103E: "ှ" MYANMAR CONSONANT SIGN MEDIAL HA -->
-            <Key
-                latin:keySpec="&#x103E;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x103E;" />
             <!-- U+102E: "ီ" MYANMAR VOWEL SIGN II -->
-            <Key
-                latin:keySpec="&#x102E;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x102E;" />
             <!-- U+1030: "ူ" MYANMAR VOWEL SIGN UU -->
-            <Key
-                latin:keySpec="&#x1030;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1030;" />
             <!-- U+102B: "ါ" MYANMAR VOWEL SIGN TALL AA -->
-            <Key
-                latin:keySpec="&#x102B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x102B;" />
             <!-- U+1032: "ဲ" MYANMAR VOWEL SIGN AI -->
-            <Key
-                latin:keySpec="&#x1032;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1032;" />
             <!-- U+1036: "ံ" MYANMAR SIGN ANUSVARA -->
-            <Key
-                latin:keySpec="&#x1036;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1036;" />
             <!-- U+101F: "ဟ" MYANMAR LETTER HA -->
-            <Key
-                latin:keySpec="&#x101F;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x101F;" />
         </case>
         <default>
             <!-- U+1031: "ေ" MYANMAR VOWEL SIGN E -->
-            <Key
-                latin:keySpec="&#x1031;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1031;" />
             <!-- U+103B: "ျ" MYANMAR CONSONANT SIGN MEDIAL YA -->
-            <Key
-                latin:keySpec="&#x103B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x103B;" />
             <!-- U+103C: "ြ" MYANMAR CONSONANT SIGN MEDIAL RA -->
-            <Key
-                latin:keySpec="&#x103C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x103C;" />
             <!-- U+103D: "ွ" MYANMAR CONSONANT SIGN MEDIAL WA
                  U+103E: "ှ" MYANMAR CONSONANT SIGN MEDIAL HA
                  U+103D/U+103E: "ွှ" MYANMAR CONSONANT SIGN MEDIAL WA/MYANMAR CONSONANT SIGN MEDIAL HA -->
             <Key
                 latin:keySpec="&#x103D;"
-                latin:moreKeys="&#x103E;,&#x103D;&#x103E;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x103E;,&#x103D;&#x103E;" />
             <!-- U+102D: "ိ" MYANMAR VOWEL SIGN I
                  U+102E: "ီ" MYANMAR VOWEL SIGN II -->
             <Key
                 latin:keySpec="&#x102D;"
-                latin:moreKeys="&#x102E;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x102E;" />
             <!-- U+102F: "ု" MYANMAR VOWEL SIGN U
                  U+1030: "ူ" MYANMAR VOWEL SIGN UU -->
             <Key
                 latin:keySpec="&#x102F;"
-                latin:moreKeys="&#x1030;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x1030;" />
             <!-- U+102C: "ာ" MYANMAR VOWEL SIGN AA -->
-            <Key
-                latin:keySpec="&#x102C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x102C;" />
             <!-- U+103A: "်" MYANMAR SIGN ASAT
                  U+1032: "ဲ" MYANMAR VOWEL SIGN AI -->
             <Key
                 latin:keySpec="&#x103A;"
-                latin:moreKeys="&#x1032;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x1032;" />
             <!-- U+1037: "့" MYANMAR SIGN DOT BELOW
                  U+1036: "ံ" MYANMAR SIGN ANUSVARA -->
             <Key
                 latin:keySpec="&#x1037;"
-                latin:moreKeys="&#x1036;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x1036;" />
             <!-- U+1038: "း" MYANMAR SIGN VISARGA -->
-            <Key
-                latin:keySpec="&#x1038;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1038;" />
         </default>
     </switch>
 </merge>