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

diff --git a/java/res/xml/rowkeys_thai2.xml b/java/res/xml/rowkeys_thai2.xml
index 7ab036a..f43d31f 100644
--- a/java/res/xml/rowkeys_thai2.xml
+++ b/java/res/xml/rowkeys_thai2.xml
@@ -18,63 +18,45 @@
 */
 -->
 
-<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+0E50: "๐" THAI DIGIT ZERO -->
+            <Key latin:keySpec="&#x0E50;" />
             <Key
-                latin:keySpec="&#x0E50;"
-                latin:keyLabelFlags="fontNormal" />
-            <Key
-                latin:keySpec="&quot;" />
+                latin:keySpec="&quot;"
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+0E0E: "ฎ" THAI CHARACTER DO CHADA -->
-            <Key
-                latin:keySpec="&#x0E0E;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E0E;" />
             <!-- U+0E11: "ฑ" THAI CHARACTER THO NANGMONTHO -->
-            <Key
-                latin:keySpec="&#x0E11;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E11;" />
             <!-- U+0E18: "ธ" THAI CHARACTER THO THONG -->
-            <Key
-                latin:keySpec="&#x0E18;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E18;" />
             <!-- U+0020: " " SPACE
                  U+0E4D: " ํ" THAI CHARACTER THANTHAKHAT -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E4D;|&#x0E4D;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0020: " " SPACE
                  U+0E4A: " ๊" THAI CHARACTER MAI TRI -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E4A;|&#x0E4A;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0E13: "ณ" THAI CHARACTER NO NEN -->
-            <Key
-                latin:keySpec="&#x0E13;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E13;" />
             <!-- U+0E2F: "ฯ" THAI CHARACTER PAIYANNOI -->
-            <Key
-                latin:keySpec="&#x0E2F;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E2F;" />
             <!-- U+0E0D: "ญ" THAI CHARACTER YO YING -->
-            <Key
-                latin:keySpec="&#x0E0D;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E0D;" />
             <!-- U+0E10: "ฐ" THAI CHARACTER THO THAN -->
+            <Key latin:keySpec="&#x0E10;" />
             <Key
-                latin:keySpec="&#x0E10;"
-                latin:keyLabelFlags="fontNormal" />
-            <Key
-                latin:keySpec="," />
+                latin:keySpec=","
+                latin:keyLabelFlags="fontDefault" />
         </case>
         <default>
             <!-- U+0E46: "ๆ" THAI CHARACTER MAIYAMOK
@@ -83,58 +65,39 @@
                 latin:keySpec="&#x0E46;"
                 latin:keyHintLabel="0"
                 latin:additionalMoreKeys="0"
-                latin:moreKeys="&#x0E50;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0E50;" />
             <!-- U+0E44: "ไ" THAI CHARACTER SARA AI MAIMALAI -->
-            <Key
-                latin:keySpec="&#x0E44;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E44;" />
             <!-- U+0E33: "ำ" THAI CHARACTER SARA AM -->
-            <Key
-                latin:keySpec="&#x0E33;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E33;" />
             <!-- U+0E1E: "พ" THAI CHARACTER PHO PHAN -->
-            <Key
-                latin:keySpec="&#x0E1E;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E1E;" />
             <!-- U+0E30: "ะ" THAI CHARACTER SARA A -->
-            <Key
-                latin:keySpec="&#x0E30;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E30;" />
             <!-- U+0020: " " SPACE
                  U+0E31: " ั" THAI CHARACTER MAI HAN-AKAT -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E31;|&#x0E31;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0020: " " SPACE
                  U+0E35: " ี" HAI CHARACTER SARA II -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E35;|&#x0E35;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0E23: "ร" THAI CHARACTER RO RUA -->
-            <Key
-                latin:keySpec="&#x0E23;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E23;" />
             <!-- U+0E19: "น" THAI CHARACTER NO NU -->
-            <Key
-                latin:keySpec="&#x0E19;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E19;" />
             <!-- U+0E22: "ย" THAI CHARACTER YO YAK -->
-            <Key
-                latin:keySpec="&#x0E22;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E22;" />
             <!-- U+0E1A: "บ" THAI CHARACTER BO BAIMAI -->
-            <Key
-                latin:keySpec="&#x0E1A;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E1A;" />
             <!-- U+0E25: "ล" THAI CHARACTER LO LING -->
-            <Key
-                latin:keySpec="&#x0E25;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E25;" />
         </default>
     </switch>
 </merge>