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

diff --git a/java/res/xml/rowkeys_thai4.xml b/java/res/xml/rowkeys_thai4.xml
index 332d09d..db665be 100644
--- a/java/res/xml/rowkeys_thai4.xml
+++ b/java/res/xml/rowkeys_thai4.xml
@@ -18,101 +18,74 @@
 */
 -->
 
-<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" />
             <Key
-                latin:keySpec=")" />
+                latin:keySpec=")"
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+0E09: "ฉ" THAI CHARACTER CHO CHING -->
-            <Key
-                latin:keySpec="&#x0E09;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E09;" />
             <!-- U+0E2E: "ฮ" THAI CHARACTER HO NOKHUK -->
-            <Key
-                latin:keySpec="&#x0E2E;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E2E;" />
             <!-- U+0020: " " SPACE
                  U+0E3A: " ฺ" THAI CHARACTER PHINTHU -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E3A;|&#x0E3A;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0020: " " SPACE
                  U+0E4C: " ์" THAI CHARACTER THANTHAKHAT -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E4C;|&#x0E4C;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <Key
-                latin:keySpec="\?" />
+                latin:keySpec="\?"
+                latin:keyLabelFlags="fontDefault" />
             <!-- U+0E12: "ฒ" THAI CHARACTER THO PHUTHAO -->
-            <Key
-                latin:keySpec="&#x0E12;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E12;" />
             <!-- U+0E2C: "ฬ" THAI CHARACTER LO CHULA -->
-            <Key
-                latin:keySpec="&#x0E2C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E2C;" />
             <!-- U+0E26: "ฦ" THAI CHARACTER LU -->
-            <Key
-                latin:keySpec="&#x0E26;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E26;" />
         </case>
         <default>
             <!-- U+0E1C: "ผ" THAI CHARACTER PHO PHUNG -->
-            <Key
-                latin:keySpec="&#x0E1C;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E1C;" />
             <!-- U+0E1B: "ป" THAI CHARACTER PO PLA -->
-            <Key
-                latin:keySpec="&#x0E1B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E1B;" />
             <!-- U+0E41: "แ" THAI CHARACTER SARA AE -->
-            <Key
-                latin:keySpec="&#x0E41;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E41;" />
             <!-- U+0E2D: "อ" THAI CHARACTER O ANG -->
-            <Key
-                latin:keySpec="&#x0E2D;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E2D;" />
             <!-- U+0020: " " SPACE
                  U+0E34: " ิ" THAI CHARACTER SARA I -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E34;|&#x0E34;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0020: " " SPACE
                  U+0E37: " ื" THAI CHARACTER SARA UEE -->
             <!-- Note: The space character is needed as a preceding letter to draw some Thai
                  composing characters correctly. -->
             <Key
                 latin:keySpec="&#x20;&#x0E37;|&#x0E37;"
-                latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+                latin:keyLabelFlags="followKeyLetterRatio" />
             <!-- U+0E17: "ท" THAI CHARACTER THO THAHAN -->
-            <Key
-                latin:keySpec="&#x0E17;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E17;" />
             <!-- U+0E21: "ม" THAI CHARACTER MO MA -->
-            <Key
-                latin:keySpec="&#x0E21;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E21;" />
             <!-- U+0E43: "ใ" THAI CHARACTER SARA AI MAIMUAN -->
-            <Key
-                latin:keySpec="&#x0E43;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E43;" />
             <!-- U+0E1D: "ฝ" THAI CHARACTER FO FA -->
-            <Key
-                latin:keySpec="&#x0E1D;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0E1D;" />
         </default>
     </switch>
 </merge>