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/rowkeys_thai1.xml b/java/res/xml/rowkeys_thai1.xml
index 4b49da1..e175bef 100644
--- a/java/res/xml/rowkeys_thai1.xml
+++ b/java/res/xml/rowkeys_thai1.xml
@@ -27,28 +27,36 @@
>
<!-- U+0E0E: "ฎ" THAI CHARACTER DO CHADA -->
<Key
- latin:keyLabel="ฎ" />
+ latin:keyLabel="ฎ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E11: "ฑ" THAI CHARACTER THO NANGMONTHO -->
<Key
- latin:keyLabel="ฑ" />
+ latin:keyLabel="ฑ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E18: "ธ" THAI CHARACTER THO THONG -->
<Key
- latin:keyLabel="ธ" />
+ latin:keyLabel="ธ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E13: "ณ" THAI CHARACTER NO NEN -->
<Key
- latin:keyLabel="ณ" />
+ latin:keyLabel="ณ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E0D: "ญ" THAI CHARACTER YO YING -->
<Key
- latin:keyLabel="ญ" />
+ latin:keyLabel="ญ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E10: "ฐ" THAI CHARACTER THO THAN -->
<Key
- latin:keyLabel="ฐ" />
+ latin:keyLabel="ฐ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E03: "ฃ" THAI CHARACTER KHO KHUAT -->
<Key
- latin:keyLabel="ฃ" />
+ latin:keyLabel="ฃ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E05: "ฅ" THAI CHARACTER KHO KHON -->
<Key
- latin:keyLabel="ฅ" />
+ latin:keyLabel="ฅ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E51: "๑" THAI DIGIT ONE
U+0E52: "๒" THAI DIGIT TWO
U+0E53: "๓" THAI DIGIT THREE
@@ -56,7 +64,8 @@
U+0E55: "๕" THAI DIGIT FIVE -->
<Key
latin:keyLabel="๑"
- latin:moreKeys="!fixedColumnOrder!4,๒,๓,๔,๕" />
+ latin:moreKeys="!fixedColumnOrder!4,๒,๓,๔,๕"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E56: "๖" THAI DIGIT SIX
U+0E57: "๗" THAI DIGIT SEVEN
U+0E58: "๘" THAI DIGIT EIGHT
@@ -64,61 +73,72 @@
U+0E50: "๐" THAI DIGIT ZERO -->
<Key
latin:keyLabel="๖"
- latin:moreKeys="!fixedColumnOrder!4,๗,๘,๙,๐" />
+ latin:moreKeys="!fixedColumnOrder!4,๗,๘,๙,๐"
+ latin:keyLabelFlags="fontNormal" />
</case>
<default>
<!-- U+0E20: "ภ" THAI CHARACTER PHO SAMPHAO -->
<Key
latin:keyLabel="ภ"
latin:keyHintLabel="1"
- latin:additionalMoreKeys="1,๑" />
+ latin:additionalMoreKeys="1,๑"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E16: "ถ" THAI CHARACTER THO THUNG -->
<Key
latin:keyLabel="ถ"
latin:keyHintLabel="2"
- latin:additionalMoreKeys="2,๒" />
+ latin:additionalMoreKeys="2,๒"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E04: "ค" THAI CHARACTER KHO KHWAI -->
<Key
latin:keyLabel="ค"
latin:keyHintLabel="3"
- latin:additionalMoreKeys="3,๓" />
+ latin:additionalMoreKeys="3,๓"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E15: "ต" THAI CHARACTER TO TAO -->
<Key
latin:keyLabel="ต"
latin:keyHintLabel="4"
- latin:additionalMoreKeys="4,๔" />
+ latin:additionalMoreKeys="4,๔"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E08: "จ" THAI CHARACTER CHO CHAN -->
<Key
latin:keyLabel="จ"
latin:keyHintLabel="5"
- latin:additionalMoreKeys="5,๕" />
+ latin:additionalMoreKeys="5,๕"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E02: "ข" THAI CHARACTER KHO KHAI -->
<Key
latin:keyLabel="ข"
latin:keyHintLabel="6"
- latin:additionalMoreKeys="6,๖" />
+ latin:additionalMoreKeys="6,๖"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E0A: "ช" THAI CHARACTER CHO CHANG -->
<Key
latin:keyLabel="ช"
latin:keyHintLabel="7"
- latin:additionalMoreKeys="7,๗" />
+ latin:additionalMoreKeys="7,๗"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E23: "ร" THAI CHARACTER RO RUA
U+0E25: "ล" THAI CHARACTER LO LING -->
<Key
latin:keyLabel="ร"
latin:moreKeys="ล"
latin:keyHintLabel="8"
- latin:additionalMoreKeys="8,๘" />
+ latin:additionalMoreKeys="8,๘"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E19: "น" THAI CHARACTER NO NU -->
<Key
latin:keyLabel="น"
latin:keyHintLabel="9"
- latin:additionalMoreKeys="9,๙" />
+ latin:additionalMoreKeys="9,๙"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E22: "ย" THAI CHARACTER YO YAK -->
<Key
latin:keyLabel="ย"
latin:keyHintLabel="0"
- latin:additionalMoreKeys="0,๐" />
+ latin:additionalMoreKeys="0,๐"
+ latin:keyLabelFlags="fontNormal" />
</default>
</switch>
</merge>