commit 92ac2aa8ed3ad889f5a31336900e3c46264df97d
author Tadashi G. Takaoka <takaoka@google.com> Mon Jul 07 16:33:06 2014 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Mon Jul 07 18:58:01 2014 +0900
tree 9cc9e15d895065c67cac7c1c566e59f57d430a59
parent b1807d0bc75fd4191a9cd45c03a777ee8e650686

Move fontNormal flag from Key to Row

Change-Id: I250da7c82e005ffe2027c528a1df731a1a3cdf47

java/res/xml/rowkeys_lao1.xml

diff --git a/java/res/xml/rowkeys_lao1.xml b/java/res/xml/rowkeys_lao1.xml
index a5085a5..f88d5fd 100644
--- a/java/res/xml/rowkeys_lao1.xml
+++ b/java/res/xml/rowkeys_lao1.xml
@@ -18,61 +18,35 @@
 */
 -->
 
-<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+0ED1: "໑" LAO DIGIT ONE -->
-            <Key
-                latin:keySpec="&#x0ED1;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ED1;" />
             <!-- U+0ED2: "໒" LAO DIGIT TWO -->
-            <Key
-                latin:keySpec="&#x0ED2;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ED2;" />
             <!-- U+0ED3: "໓" LAO DIGIT THREE -->
-            <Key
-                latin:keySpec="&#x0ED3;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ED3;" />
             <!-- U+0ED4: "໔" LAO DIGIT FOUR -->
-            <Key
-                latin:keySpec="&#x0ED4;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ED4;" />
             <!-- U+0ECC: "໌" LAO CANCELLATION MARK -->
-            <Key
-                latin:keySpec="&#x0ECC;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ECC;" />
             <!-- U+0EBC: "ຼ" LAO SEMIVOWEL SIGN LO -->
-            <Key
-                latin:keySpec="&#x0EBC;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EBC;" />
             <!-- U+0ED5: "໕" LAO DIGIT FIVE -->
-            <Key
-                latin:keySpec="&#x0ED5;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ED5;" />
             <!-- U+0ED6: "໖" LAO DIGIT SIX -->
-            <Key
-                latin:keySpec="&#x0ED6;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ED6;" />
             <!-- U+0ED7: "໗" LAO DIGIT SEVEN -->
-            <Key
-                latin:keySpec="&#x0ED7;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ED7;" />
             <!-- U+0ED8: "໘" LAO DIGIT EIGHT -->
-            <Key
-                latin:keySpec="&#x0ED8;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ED8;" />
             <!-- U+0ED9: "໙" LAO DIGIT NINE -->
-            <Key
-                latin:keySpec="&#x0ED9;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ED9;" />
             <!-- U+0ECD/U+0EC8: "ໍ່" LAO NIGGAHITA/LAO TONE MAI EK -->
             <Key
                 latin:keySpec="&#x0ECD;&#x0EC8;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
         </case>
         <default>
             <!-- U+0EA2: "ຢ" LAO LETTER YO
@@ -81,84 +55,69 @@
                 latin:keySpec="&#x0EA2;"
                 latin:keyHintLabel="1"
                 latin:additionalMoreKeys="1"
-                latin:moreKeys="&#x0ED1;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0ED1;" />
             <!-- U+0E9F: "ຟ" LAO LETTER FO SUNG
                  U+0ED2: "໒" LAO DIGIT TWO -->
             <Key
                 latin:keySpec="&#x0E9F;"
                 latin:keyHintLabel="2"
                 latin:additionalMoreKeys="2"
-                latin:moreKeys="&#x0ED2;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0ED2;" />
             <!-- U+0EC2: "ໂ" LAO VOWEL SIGN O
                  U+0ED3: "໓" LAO DIGIT THREE -->
             <Key
                 latin:keySpec="&#x0EC2;"
                 latin:keyHintLabel="3"
                 latin:additionalMoreKeys="3"
-                latin:moreKeys="&#x0ED3;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0ED3;" />
             <!-- U+0E96: "ຖ" LAO LETTER THO SUNG
                  U+0ED4: "໔" LAO DIGIT FOUR -->
             <Key
                 latin:keySpec="&#x0E96;"
                 latin:keyHintLabel="4"
                 latin:additionalMoreKeys="4"
-                latin:moreKeys="&#x0ED4;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0ED4;" />
             <!-- U+0EB8: "ຸ" LAO VOWEL SIGN U -->
-            <Key
-                latin:keySpec="&#x0EB8;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EB8;" />
             <!-- U+0EB9: "ູ" LAO VOWEL SIGN UU -->
-            <Key
-                latin:keySpec="&#x0EB9;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0EB9;" />
             <!-- U+0E84: "ຄ" LAO LETTER KHO TAM
                  U+0ED5: "໕" LAO DIGIT FIVE -->
             <Key
                 latin:keySpec="&#x0E84;"
                 latin:keyHintLabel="5"
                 latin:additionalMoreKeys="5"
-                latin:moreKeys="&#x0ED5;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0ED5;" />
             <!-- U+0E95: "ຕ" LAO LETTER TO
                  U+0ED6: "໖" LAO DIGIT SIX -->
             <Key
                 latin:keySpec="&#x0E95;"
                 latin:keyHintLabel="6"
                 latin:additionalMoreKeys="6"
-                latin:moreKeys="&#x0ED6;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0ED6;" />
             <!-- U+0E88: "ຈ" LAO LETTER CO
                  U+0ED7: "໗" LAO DIGIT SEVEN -->
             <Key
                 latin:keySpec="&#x0E88;"
                 latin:keyHintLabel="7"
                 latin:additionalMoreKeys="7"
-                latin:moreKeys="&#x0ED7;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0ED7;" />
             <!-- U+0E82: "ຂ" LAO LETTER KHO SUNG
                  U+0ED8: "໘" LAO DIGIT EIGHT -->
             <Key
                 latin:keySpec="&#x0E82;"
                 latin:keyHintLabel="8"
                 latin:additionalMoreKeys="8"
-                latin:moreKeys="&#x0ED8;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0ED8;" />
             <!-- U+0E8A: "ຊ" LAO LETTER SO TAM
                  U+0ED9: "໙" LAO DIGIT NINE -->
             <Key
                 latin:keySpec="&#x0E8A;"
                 latin:keyHintLabel="9"
                 latin:additionalMoreKeys="9"
-                latin:moreKeys="&#x0ED9;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0ED9;" />
             <!-- U+0ECD: "ໍ" LAO NIGGAHITA -->
-            <Key
-                latin:keySpec="&#x0ECD;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0ECD;" />
         </default>
     </switch>
 </merge>