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_thai4.xml b/java/res/xml-sw600dp/rowkeys_thai4.xml
index 64549bd..8a78424 100644
--- a/java/res/xml-sw600dp/rowkeys_thai4.xml
+++ b/java/res/xml-sw600dp/rowkeys_thai4.xml
@@ -31,59 +31,92 @@
latin:keyLabel=")" />
<!-- U+0E09: "ฉ" THAI CHARACTER CHO CHING -->
<Key
- latin:keyLabel="ฉ" />
+ latin:keyLabel="ฉ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E2E: "ฮ" THAI CHARACTER HO NOKHUK -->
<Key
- latin:keyLabel="ฮ" />
- <!-- U+0E3A: " ฺ" THAI CHARACTER PHINTHU -->
+ latin:keyLabel="ฮ"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- 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:keyLabel="ฺ" />
- <!-- U+0E4C: " ์" THAI CHARACTER THANTHAKHAT -->
+ latin:keyLabel=" ฺ"
+ latin:code="0x0E3A"
+ latin:keyLabelFlags="fontNormal|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:keyLabel="์" />
+ latin:keyLabel=" ์"
+ latin:code="0x0E4C"
+ latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<Key
latin:keyLabel="\?" />
<!-- U+0E12: "ฒ" THAI CHARACTER THO PHUTHAO -->
<Key
- latin:keyLabel="ฒ" />
+ latin:keyLabel="ฒ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E2C: "ฬ" THAI CHARACTER LO CHULA -->
<Key
- latin:keyLabel="ฬ" />
+ latin:keyLabel="ฬ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E26: "ฦ" THAI CHARACTER LU -->
<Key
- latin:keyLabel="ฦ" />
+ latin:keyLabel="ฦ"
+ latin:keyLabelFlags="fontNormal" />
</case>
<default>
<!-- U+0E1C: "ผ" THAI CHARACTER PHO PHUNG -->
<Key
- latin:keyLabel="ผ" />
+ latin:keyLabel="ผ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E1B: "ป" THAI CHARACTER PO PLA -->
<Key
- latin:keyLabel="ป" />
+ latin:keyLabel="ป"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E41: "แ" THAI CHARACTER SARA AE -->
<Key
- latin:keyLabel="แ" />
+ latin:keyLabel="แ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E2D: "อ" THAI CHARACTER O ANG -->
<Key
- latin:keyLabel="อ" />
- <!-- U+0E34: " ิ" THAI CHARACTER SARA I -->
+ latin:keyLabel="อ"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- 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:keyLabel="ิ" />
- <!-- U+0E37: " ื" THAI CHARACTER SARA UEE -->
+ latin:keyLabel=" ิ"
+ latin:code="0x0E34"
+ latin:keyLabelFlags="fontNormal|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:keyLabel="ื" />
+ latin:keyLabel=" ื"
+ latin:code="0x0E37"
+ latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0E17: "ท" THAI CHARACTER THO THAHAN -->
<Key
- latin:keyLabel="ท" />
+ latin:keyLabel="ท"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E21: "ม" THAI CHARACTER MO MA -->
<Key
- latin:keyLabel="ม" />
+ latin:keyLabel="ม"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E43: "ใ" THAI CHARACTER SARA AI MAIMUAN -->
<Key
- latin:keyLabel="ใ" />
+ latin:keyLabel="ใ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E1D: "ฝ" THAI CHARACTER FO FA -->
<Key
- latin:keyLabel="ฝ" />
+ latin:keyLabel="ฝ"
+ latin:keyLabelFlags="fontNormal" />
</default>
</switch>
</merge>