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/kbd_pcqwerty.xml b/java/res/xml/kbd_pcqwerty.xml
index a6ab2ba..777c71a 100644
--- a/java/res/xml/kbd_pcqwerty.xml
+++ b/java/res/xml/kbd_pcqwerty.xml
@@ -21,9 +21,9 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:rowHeight="20%p"
- latin:verticalGap="@fraction/key_bottom_gap_5rows"
- latin:keyLetterSize="@fraction/key_letter_ratio_5rows"
- latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5rows"
+ latin:verticalGap="@fraction/key_bottom_gap_5row"
+ latin:keyLetterSize="@fraction/key_letter_ratio_5row"
+ latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5row"
latin:touchPositionCorrectionData="@null"
>
<include
diff --git a/java/res/xml/kbd_pcqwerty_symbols.xml b/java/res/xml/kbd_pcqwerty_symbols.xml
index e862748..a2297f7 100644
--- a/java/res/xml/kbd_pcqwerty_symbols.xml
+++ b/java/res/xml/kbd_pcqwerty_symbols.xml
@@ -21,9 +21,9 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
latin:rowHeight="20%p"
- latin:verticalGap="@fraction/key_bottom_gap_5rows"
- latin:keyLetterSize="@fraction/key_letter_ratio_5rows"
- latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5rows"
+ latin:verticalGap="@fraction/key_bottom_gap_5row"
+ latin:keyLetterSize="@fraction/key_letter_ratio_5row"
+ latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5row"
latin:touchPositionCorrectionData="@null"
>
<include
diff --git a/java/res/xml/kbd_thai.xml b/java/res/xml/kbd_thai.xml
index b015d70..058ca16 100644
--- a/java/res/xml/kbd_thai.xml
+++ b/java/res/xml/kbd_thai.xml
@@ -20,7 +20,6 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyTypeface="normal"
>
<include
latin:keyboardLayout="@xml/rows_thai" />
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>
diff --git a/java/res/xml/rowkeys_thai2.xml b/java/res/xml/rowkeys_thai2.xml
index 80e3563..f5fd405 100644
--- a/java/res/xml/rowkeys_thai2.xml
+++ b/java/res/xml/rowkeys_thai2.xml
@@ -27,60 +27,76 @@
>
<!-- 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+0E0C: "ฌ" THAI CHARACTER CHO CHOE -->
<Key
- latin:keyLabel="ฌ" />
+ latin:keyLabel="ฌ"
+ latin:keyLabelFlags="fontNormal" />
<!-- 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" />
<!-- U+0E3F: "฿" THAI CURRENCY SYMBOL BAHT
U+0E45: "ๅ" THAI CHARACTER LAKKHANGYAO -->
<Key
latin:keyLabel="฿"
- latin:moreKeys="ๅ" />
+ latin:moreKeys="ๅ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E46: "ๆ" THAI CHARACTER MAIYAMOK
U+0E2F: "ฯ" THAI CHARACTER PAIYANNOI -->
<Key
latin:keyLabel="ๆ"
- latin:moreKeys="ฯ" />
+ latin:moreKeys="ฯ"
+ latin:keyLabelFlags="fontNormal" />
</case>
<default>
<!-- U+0E1F: "ฟ" THAI CHARACTER FO FAN
U+0E1E: "พ" THAI CHARACTER PHO PHAN -->
<Key
latin:keyLabel="ฟ"
- latin:moreKeys="พ" />
+ latin:moreKeys="พ"
+ 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+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" />
<!-- U+0E30: "ะ" THAI CHARACTER SARA A
U+0E32: "า" THAI CHARACTER SARA AA
U+0E33: " ำ" THAI CHARACTER SARA AM
@@ -91,17 +107,23 @@
U+0E42: "โ" THAI CHARACTER SARA O -->
<Key
latin:keyLabel="ะ"
- latin:moreKeys="า,ำ,เ,แ,ใ,ไ,โ" />
- <!-- U+0E31: " ั" THAI CHARACTER MAI HAN-AKAT
+ latin:moreKeys="า,ำ,เ,แ,ใ,ไ,โ"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0020: " " SPACE
+ U+0E31: " ั" THAI CHARACTER MAI HAN-AKAT
U+0E34: " ิ" THAI CHARACTER SARA I
U+0E35: " ี" THAI CHARACTER SARA II
U+0E36: " ึ" THAI CHARACTER SARA UE
U+0E37: " ื" THAI CHARACTER SARA UEE
U+0E38: " ุ" THAI CHARACTER SARA U
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:moreKeys="ิ,ี,ึ,ื,ุ,ู" />
+ latin:keyLabel=" ั"
+ latin:code="0x0E31"
+ latin:moreKeys="ิ,ี,ึ,ื,ุ,ู"
+ latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/rowkeys_thai3.xml b/java/res/xml/rowkeys_thai3.xml
index b833807..2fcc006 100644
--- a/java/res/xml/rowkeys_thai3.xml
+++ b/java/res/xml/rowkeys_thai3.xml
@@ -27,57 +27,83 @@
>
<!-- U+0E09: "ฉ" THAI CHARACTER CHO CHING -->
<Key
- latin:keyLabel="ฉ" />
+ latin:keyLabel="ฉ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E2E: "ฮ" THAI CHARACTER HO NOKHUK -->
<Key
- latin:keyLabel="ฮ" />
+ latin:keyLabel="ฮ"
+ latin:keyLabelFlags="fontNormal" />
<!-- 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="ฦ" />
- <!-- U+0E4C: " ์" THAI CHARACTER THANTHAKHAT
+ latin:keyLabel="ฦ"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0020: " " SPACE
+ U+0E4C: " ์" THAI CHARACTER THANTHAKHAT
U+0E4D: " ํ" THAI CHARACTER NIKHAHIT
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="์"
- latin:moreKeys="ํ,ฺ" />
- <!-- U+0E47: " ็" THAI CHARACTER MAITAIKHU -->
+ latin:keyLabel=" ์"
+ latin:code="0x0E4C"
+ latin:moreKeys="ํ,ฺ"
+ latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ <!-- 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="็" />
+ latin:keyLabel=" ็"
+ latin:code="0x0E47"
+ latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
</case>
<default>
<!-- U+0E1C: "ผ" THAI CHARACTER PHO PHUNG -->
<Key
- latin:keyLabel="ผ" />
+ latin:keyLabel="ผ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E1B: "ป" THAI CHARACTER PO PLA
U+0E1A: "บ" THAI CHARACTER BO BAIMAI -->
<Key
latin:keyLabel="ป"
- latin:moreKeys="บ" />
+ latin:moreKeys="บ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0E2D: "อ" THAI CHARACTER O ANG -->
<Key
- latin:keyLabel="อ" />
+ latin:keyLabel="อ"
+ latin:keyLabelFlags="fontNormal" />
<!-- 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+0E1D: "ฝ" THAI CHARACTER FO FA -->
<Key
- latin:keyLabel="ฝ" />
- <!-- U+0E48: " ่" THAI CHARACTER MAI EK
+ latin:keyLabel="ฝ"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0020: " " SPACE
+ U+0E48: " ่" THAI CHARACTER MAI EK
U+0E49: " ้" THAI CHARACTER MAI THO
U+0E4A: " ๊" THAI CHARACTER MAI TRI
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:moreKeys="้,๊,๋" />
+ latin:keyLabel=" ่"
+ latin:code="0x0E48"
+ latin:moreKeys="้,๊,๋"
+ latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
</default>
</switch>
</merge>