Use normal font for Thai
This change also adds workaround to display Thai composing letters
correctly.
Bug: 6753168
Change-Id: Ibd42ebb40df08b5de32b3500f10003c4a5de4897
diff --git a/java/res/xml-sw600dp/rowkeys_thai3.xml b/java/res/xml-sw600dp/rowkeys_thai3.xml
index 7507dde..b9d1475 100644
--- a/java/res/xml-sw600dp/rowkeys_thai3.xml
+++ b/java/res/xml-sw600dp/rowkeys_thai3.xml
@@ -27,71 +27,108 @@
>
<!-- U+0E24: "ฤ" THAI CHARACTER RU -->
<Key
- latin:keyLabel="ฤ" />
+ latin:keyLabel="ฤ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E06: "ฆ" THAI CHARACTER KHO RAKHANG -->
<Key
- latin:keyLabel="ฆ" />
+ latin:keyLabel="ฆ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E0F: "ฏ" THAI CHARACTER TO PATAK -->
<Key
- latin:keyLabel="ฏ" />
+ latin:keyLabel="ฏ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E42: "โ" THAI CHARACTER SARA O -->
<Key
- latin:keyLabel="โ" />
+ latin:keyLabel="โ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E0C: "ฌ" THAI CHARACTER CHO CHOE -->
<Key
- latin:keyLabel="ฌ" />
- <!-- U+0E47: " ็" THAI CHARACTER MAITAIKHU -->
+ latin:keyLabel="ฌ"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0020: " " SPACE
+ U+0E47: " ็" THAI CHARACTER MAITAIKHU -->
+ <!-- Note: The space character is needed as a preceding letter to draw some Thai
+ composing characters correctly. -->
<Key
- latin:keyLabel="็" />
- <!-- U+0E4B: " ๋" THAI CHARACTER MAI CHATTAWA -->
+ latin:keyLabel=" ็"
+ latin:code="0x0E47"
+ latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ <!-- U+0020: " " SPACE
+ U+0E4B: " ๋" THAI CHARACTER MAI CHATTAWA -->
+ <!-- Note: The space character is needed as a preceding letter to draw some Thai
+ composing characters correctly. -->
<Key
- latin:keyLabel="๋" />
+ latin:keyLabel=" ๋"
+ latin:code="0x0E4B"
+ latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0E29: "ษ" THAI CHARACTER SO RUSI -->
<Key
- latin:keyLabel="ษ" />
+ latin:keyLabel="ษ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E28: "ศ" THAI CHARACTER SO SALA -->
<Key
- latin:keyLabel="ศ" />
+ latin:keyLabel="ศ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E0B: "ซ" THAI CHARACTER SO SO -->
<Key
- latin:keyLabel="ซ" />
+ latin:keyLabel="ซ"
+ latin:keyLabelFlags="fontNormal" />
<Key
latin:keyLabel="." />
</case>
<default>
<!-- U+0E1F: "ฟ" THAI CHARACTER FO FAN -->
<Key
- latin:keyLabel="ฟ" />
+ latin:keyLabel="ฟ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E2B: "ห" THAI CHARACTER HO HIP -->
<Key
- latin:keyLabel="ห" />
+ latin:keyLabel="ห"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E01: "ก" THAI CHARACTER KO KAI -->
<Key
- latin:keyLabel="ก" />
+ latin:keyLabel="ก"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E14: "ด" THAI CHARACTER DO DEK -->
<Key
- latin:keyLabel="ด" />
+ latin:keyLabel="ด"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E40: "เ" THAI CHARACTER SARA E -->
<Key
- latin:keyLabel="เ" />
- <!-- U+0E49: " ้" THAI CHARACTER MAI THO -->
+ latin:keyLabel="เ"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0020: " " SPACE
+ U+0E49: " ้" THAI CHARACTER MAI THO -->
+ <!-- Note: The space character is needed as a preceding letter to draw some Thai
+ composing characters correctly. -->
<Key
- latin:keyLabel="้" />
- <!-- U+0E48: " ฺ" THAI CHARACTER MAI EK -->
+ latin:keyLabel=" ้"
+ latin:code="0x0E49"
+ latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ <!-- U+0020: " " SPACE
+ U+0E48: " ฺ" THAI CHARACTER MAI EK -->
+ <!-- Note: The space character is needed as a preceding letter to draw some Thai
+ composing characters correctly. -->
<Key
- latin:keyLabel="่" />
+ latin:keyLabel=" ่"
+ latin:code="0x0E48"
+ latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0E32: "า" THAI CHARACTER SARA AA -->
<Key
- latin:keyLabel="า" />
+ latin:keyLabel="า"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E2A: "ส" THAI CHARACTER SO SUA -->
<Key
- latin:keyLabel="ส" />
+ latin:keyLabel="ส"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E27: "ว" THAI CHARACTER WO WAEN -->
<Key
- latin:keyLabel="ว" />
+ latin:keyLabel="ว"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E07: "ง" THAI CHARACTER NGO NGU -->
<Key
- latin:keyLabel="ง" />
+ latin:keyLabel="ง"
+ latin:keyLabelFlags="fontNormal" />
</default>
</switch>
</merge>