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_thai1.xml b/java/res/xml-sw600dp/rowkeys_thai1.xml
index 6aec7c2..842bf05 100644
--- a/java/res/xml-sw600dp/rowkeys_thai1.xml
+++ b/java/res/xml-sw600dp/rowkeys_thai1.xml
@@ -27,71 +27,104 @@
>
<!-- U+0E51: "๑" THAI DIGIT ONE -->
<Key
- latin:keyLabel="๑" />
+ latin:keyLabel="๑"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E52: "๒" THAI DIGIT TWO -->
<Key
- latin:keyLabel="๒" />
+ latin:keyLabel="๒"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E53: "๓" THAI DIGIT THREE -->
<Key
- latin:keyLabel="๓" />
+ latin:keyLabel="๓"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E54: "๔" THAI DIGIT FOUR -->
<Key
- latin:keyLabel="๔" />
- <!-- U+0E39: " ู" THAI CHARACTER SARA UU -->
+ latin:keyLabel="๔"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- 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:keyLabel="ู" />
+ latin:keyLabel=" ู"
+ latin:code="0x0E39"
+ latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0E3F: "฿" THAI CURRENCY SYMBOL BAHT -->
<Key
- latin:keyLabel="฿" />
+ latin:keyLabel="฿"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E55: "๕" THAI DIGIT FIVE -->
<Key
- latin:keyLabel="๕" />
+ latin:keyLabel="๕"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E56: "๖" THAI DIGIT SIX -->
<Key
- latin:keyLabel="๖" />
+ latin:keyLabel="๖"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E57: "๗" THAI DIGIT SEVEN -->
<Key
- latin:keyLabel="๗" />
+ latin:keyLabel="๗"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E58: "๘" THAI DIGIT EIGHT -->
<Key
- latin:keyLabel="๘" />
+ latin:keyLabel="๘"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E59: "๙" THAI DIGIT NINE -->
<Key
- latin:keyLabel="๙" />
+ latin:keyLabel="๙"
+ latin:keyLabelFlags="fontNormal" />
</case>
<default>
<!-- U+0E45: "ๅ" THAI CHARACTER LAKKHANGYAO -->
<Key
- latin:keyLabel="ๅ" />
+ latin:keyLabel="ๅ"
+ latin:keyLabelFlags="fontNormal" />
<Key
latin:keyLabel="/" />
<!-- U+0E20: "ภ" THAI CHARACTER PHO SAMPHAO -->
<Key
- latin:keyLabel="ภ" />
+ latin:keyLabel="ภ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E16: "ถ" THAI CHARACTER THO THUNG -->
<Key
- latin:keyLabel="ถ" />
- <!-- U+0E38: " ุ" THAI CHARACTER SARA U -->
+ latin:keyLabel="ถ"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- 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:keyLabel="ุ" />
- <!-- U+0E36: " ึ" THAI CHARACTER SARA UE -->
+ latin:keyLabel=" ุ"
+ latin:code="0x0E38"
+ latin:keyLabelFlags="fontNormal|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:keyLabel="ึ" />
+ latin:keyLabel=" ึ"
+ latin:code="0x0E36"
+ latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0E04: "ค" THAI CHARACTER KHO KHWAI -->
<Key
- latin:keyLabel="ค" />
+ latin:keyLabel="ค"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E15: "ต" THAI CHARACTER TO TAO -->
<Key
- latin:keyLabel="ต" />
+ latin:keyLabel="ต"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E08: "จ" THAI CHARACTER CHO CHAN -->
<Key
- latin:keyLabel="จ" />
+ latin:keyLabel="จ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E02: "ข" THAI CHARACTER KHO KHAI -->
<Key
- latin:keyLabel="ข" />
+ latin:keyLabel="ข"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E0A: "ช" THAI CHARACTER CHO CHANG -->
<Key
- latin:keyLabel="ช" />
+ latin:keyLabel="ช"
+ latin:keyLabelFlags="fontNormal" />
</default>
</switch>
</merge>