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_thai1.xml

diff --git a/java/res/xml/rowkeys_thai1.xml b/java/res/xml/rowkeys_thai1.xml
index e42bda3..864bca8 100644
--- a/java/res/xml/rowkeys_thai1.xml
+++ b/java/res/xml/rowkeys_thai1.xml
@@ -18,150 +18,120 @@
 */
 -->
 
-<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">
             <Key
-                latin:keySpec="+" />
+                latin:keySpec="+"
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+0E51: "๑" THAI DIGIT ONE -->
-            <Key
-                latin:keySpec="&#x0E51;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E51;" />
             <!-- U+0E52: "๒" THAI DIGIT TWO -->
-            <Key
-                latin:keySpec="&#x0E52;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E52;" />
             <!-- U+0E53: "๓" THAI DIGIT THREE -->
-            <Key
-                latin:keySpec="&#x0E53;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E53;" />
             <!-- U+0E54: "๔" THAI DIGIT FOUR -->
-            <Key
-                latin:keySpec="&#x0E54;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E54;" />
             <!-- U+0020: " " SPACE
                  U+0E39: " ู" THAI CHARACTER SARA UU -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E39;|&#x0E39;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0E3F: "฿" THAI CURRENCY SYMBOL BAHT -->
-            <Key
-                latin:keySpec="&#x0E3F;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E3F;" />
             <!-- U+0E55: "๕" THAI DIGIT FIVE -->
-            <Key
-                latin:keySpec="&#x0E55;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E55;" />
             <!-- U+0E56: "๖" THAI DIGIT SIX -->
-            <Key
-                latin:keySpec="&#x0E56;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E56;" />
             <!-- U+0E57: "๗" THAI DIGIT SEVEN -->
-            <Key
-                latin:keySpec="&#x0E57;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E57;" />
             <!-- U+0E58: "๘" THAI DIGIT EIGHT -->
-            <Key
-                latin:keySpec="&#x0E58;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E58;" />
             <!-- U+0E59: "๙" THAI DIGIT NINE -->
-            <Key
-                latin:keySpec="&#x0E59;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E59;" />
         </case>
         <default>
             <!-- U+0E45: "ๅ" THAI CHARACTER LAKKHANGYAO -->
-            <Key
-                latin:keySpec="&#x0E45;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E45;" />
             <!-- U+0E51: "๑" THAI DIGIT ONE -->
             <Key
+                latin:keySpec="/"
                 latin:keyHintLabel="1"
                 latin:additionalMoreKeys="1"
                 latin:moreKeys="&#x0E51;"
-                latin:keySpec="/" />
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+0E52: "๒" THAI DIGIT TWO -->
             <Key
+                latin:keySpec="_"
                 latin:keyHintLabel="2"
                 latin:additionalMoreKeys="2"
                 latin:moreKeys="&#x0E52;"
-                latin:keySpec="_" />
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+0E20: "ภ" THAI CHARACTER PHO SAMPHAO
                  U+0E53: "๓" THAI DIGIT THREE -->
             <Key
                 latin:keySpec="&#x0E20;"
                 latin:keyHintLabel="3"
                 latin:additionalMoreKeys="3"
-                latin:moreKeys="&#x0E53;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0E53;" />
             <!-- U+0E16: "ถ" THAI CHARACTER THO THUNG
                  U+0E54: "๔" THAI DIGIT FOUR -->
             <Key
                 latin:keySpec="&#x0E16;"
                 latin:keyHintLabel="4"
                 latin:additionalMoreKeys="4"
-                latin:moreKeys="&#x0E54;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0E54;" />
             <!-- U+0020: " " SPACE
                  U+0E38: " ุ" THAI CHARACTER SARA U -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E38;|&#x0E38;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0020: " " SPACE
                  U+0E36: " ึ" THAI CHARACTER SARA UE -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E36;|&#x0E36;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0E04: "ค" THAI CHARACTER KHO KHWAI
                  U+0E55: "๕" THAI DIGIT FIVE -->
             <Key
                 latin:keySpec="&#x0E04;"
                 latin:keyHintLabel="5"
                 latin:additionalMoreKeys="5"
-                latin:moreKeys="&#x0E55;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0E55;" />
             <!-- U+0E15: "ต" THAI CHARACTER TO TAO
                  U+0E56: "๖" THAI DIGIT SIX -->
             <Key
                 latin:keySpec="&#x0E15;"
                 latin:keyHintLabel="6"
                 latin:additionalMoreKeys="6"
-                latin:moreKeys="&#x0E56;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0E56;" />
             <!-- U+0E08: "จ" THAI CHARACTER CHO CHAN
                  U+0E57: "๗" THAI DIGIT SEVEN -->
             <Key
                 latin:keySpec="&#x0E08;"
                 latin:keyHintLabel="7"
                 latin:additionalMoreKeys="7"
-                latin:moreKeys="&#x0E57;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0E57;" />
             <!-- U+0E02: "ข" THAI CHARACTER KHO KHAI
                  U+0E58: "๘" THAI DIGIT EIGHT -->
             <Key
                 latin:keySpec="&#x0E02;"
                 latin:keyHintLabel="8"
                 latin:additionalMoreKeys="8"
-                latin:moreKeys="&#x0E58;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0E58;" />
             <!-- U+0E0A: "ช" THAI CHARACTER CHO CHANG
                  U+0E59: "๙" THAI DIGIT NINE -->
             <Key
                 latin:keySpec="&#x0E0A;"
                 latin:keyHintLabel="9"
                 latin:additionalMoreKeys="9"
-                latin:moreKeys="&#x0E59;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0E59;" />
         </default>
     </switch>
 </merge>