Move fontNormal flag from Key to Row

Change-Id: I250da7c82e005ffe2027c528a1df731a1a3cdf47

1 files changed, 26 insertions, 74 deletions

diff --git a/java/res/xml/rowkeys_khmer2.xml b/java/res/xml/rowkeys_khmer2.xml
index 4146895f7..04ca1e0df 100644
--- a/java/res/xml/rowkeys_khmer2.xml
+++ b/java/res/xml/rowkeys_khmer2.xml
@@ -18,117 +18,70 @@
 */
 -->
 
-<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+1788: "ឈ" KHMER LETTER CHO
                  U+17DC: "ៜ" KHMER SIGN AVAKRAHASANYA -->
             <Key
                 latin:keySpec="&#x1788;"
                 latin:keyHintLabel="&#x17DC;"
-                latin:moreKeys="&#x17DC;"
-                latin:keyLabelFlags="fontNormal|autoScale" />
+                latin:moreKeys="&#x17DC;" />
             <!-- U+17BA: "ឺ" KHMER VOWEL SIGN YY
                  U+17DD: "៝" KHMER SIGN ATTHACAN -->
             <Key
                 latin:keySpec="&#x17BA;"
                 latin:keyHintLabel="&#x17DD;"
                 latin:keyHintLabelVerticalAdjustment="40%"
-                latin:moreKeys="&#x17DD;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17DD;" />
             <!-- U+17C2: "ែ" KHMER VOWEL SIGN AE -->
-            <Key
-                latin:keySpec="&#x17C2;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17C2;" />
             <!-- U+17AC: "ឬ" KHMER INDEPENDENT VOWEL RYY
                  U+17AB: "ឫ" KHMER INDEPENDENT VOWEL RY -->
             <Key
                 latin:keySpec="&#x17AC;"
                 latin:keyHintLabel="&#x17AB;"
-                latin:moreKeys="&#x17AB;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17AB;" />
             <!-- U+1791: "ទ" KHMER LETTER TO -->
-            <Key
-                latin:keySpec="&#x1791;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1791;" />
             <!-- U+17BD: "ួ" KHMER VOWEL SIGN UA -->
-            <Key
-                latin:keySpec="&#x17BD;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17BD;" />
             <!-- U+17BC: "ូ" KHMER VOWEL SIGN UU -->
-            <Key
-                latin:keySpec="&#x17BC;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17BC;" />
             <!-- U+17B8: "ី" KHMER VOWEL SIGN II -->
-            <Key
-                latin:keySpec="&#x17B8;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17B8;" />
             <!-- U+17C5: "ៅ" KHMER VOWEL SIGN AU -->
-            <Key
-                latin:keySpec="&#x17C5;"
-                latin:keyLabelFlags="fontNormal|autoScale" />
+            <Key latin:keySpec="&#x17C5;" />
             <!-- U+1797: "ភ" KHMER LETTER PHO -->
-            <Key
-                latin:keySpec="&#x1797;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1797;" />
             <!-- U+17BF: "ឿ" KHMER VOWEL SIGN YA -->
-            <Key
-                latin:keySpec="&#x17BF;"
-                latin:keyLabelFlags="fontNormal|autoScale" />
+            <Key latin:keySpec="&#x17BF;" />
             <!-- U+17B0: "ឰ" KHMER INDEPENDENT VOWEL QAI -->
-            <Key
-                latin:keySpec="&#x17B0;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17B0;" />
         </case>
         <default>
             <!-- U+1786: "ឆ" KHMER LETTER CHA -->
-            <Key
-                latin:keySpec="&#x1786;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1786;" />
             <!-- U+17B9: "ឹ" KHMER VOWEL SIGN Y -->
-            <Key
-                latin:keySpec="&#x17B9;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17B9;" />
             <!-- U+17C1: "េ" KHMER VOWEL SIGN E -->
-            <Key
-                latin:keySpec="&#x17C1;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17C1;" />
             <!-- U+179A: "រ" KHMER LETTER RO -->
-            <Key
-                latin:keySpec="&#x179A;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x179A;" />
             <!-- U+178F: "ត" KHMER LETTER TA -->
-            <Key
-                latin:keySpec="&#x178F;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x178F;" />
             <!-- U+1799: "យ" KHMER LETTER YO -->
-            <Key
-                latin:keySpec="&#x1799;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1799;" />
             <!-- U+17BB: "ុ" KHMER VOWEL SIGN U -->
-            <Key
-                latin:keySpec="&#x17BB;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17BB;" />
             <!-- U+17B7: "ិ" KHMER VOWEL SIGN I -->
-            <Key
-                latin:keySpec="&#x17B7;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x17B7;" />
             <!-- U+17C4: "ោ" KHMER VOWEL SIGN OO -->
-            <Key
-                latin:keySpec="&#x17C4;"
-                latin:keyLabelFlags="fontNormal|autoScale" />
+            <Key latin:keySpec="&#x17C4;" />
             <!-- U+1795: "ផ" KHMER LETTER PHA -->
-            <Key
-                latin:keySpec="&#x1795;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x1795;" />
             <!-- U+17C0: "ៀ" KHMER VOWEL SIGN IE -->
-            <Key
-                latin:keySpec="&#x17C0;"
-                latin:keyLabelFlags="fontNormal|autoScale" />
+            <Key latin:keySpec="&#x17C0;" />
             <!-- U+17AA: "ឪ" KHMER INDEPENDENT VOWEL QUUV
                  U+17A7: "ឧ" KHMER INDEPENDENT VOWEL QU
                  U+17B1: "ឱ" KHMER INDEPENDENT VOWEL QOO TYPE ONE
@@ -138,8 +91,7 @@
             <Key
                 latin:keySpec="&#x17AA;"
                 latin:keyHintLabel="&#x17A7;"
-                latin:moreKeys="&#x17A7;,&#x17B1;,&#x17B3;,&#x17A9;,&#x17A8;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x17A7;,&#x17B1;,&#x17B3;,&#x17A9;,&#x17A8;" />
         </default>
     </switch>
 </merge>