Use 5-row layout for Thai phone keybopard
Bug: 6911182
Change-Id: I78f59564e8c31b9b66ed9a136584d0c57cc43120
diff --git a/java/res/xml/rowkeys_thai3.xml b/java/res/xml/rowkeys_thai3.xml
index 2fcc006..7b6e637 100644
--- a/java/res/xml/rowkeys_thai3.xml
+++ b/java/res/xml/rowkeys_thai3.xml
@@ -25,38 +25,27 @@
<case
latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
>
- <!-- U+0E09: "ฉ" THAI CHARACTER CHO CHING -->
+ <!-- U+0E24: "ฤ" THAI CHARACTER RU -->
<Key
- latin:keyLabel="ฉ"
+ latin:keyLabel="ฤ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0E2E: "ฮ" THAI CHARACTER HO NOKHUK -->
+ <!-- U+0E06: "ฆ" THAI CHARACTER KHO RAKHANG -->
<Key
- latin:keyLabel="ฮ"
+ latin:keyLabel="ฆ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0E12: "ฒ" THAI CHARACTER THO PHUTHAO -->
+ <!-- U+0E0F: "ฏ" THAI CHARACTER TO PATAK -->
<Key
- latin:keyLabel="ฒ"
+ latin:keyLabel="ฏ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0E2C: "ฬ" THAI CHARACTER LO CHULA -->
+ <!-- U+0E42: "โ" THAI CHARACTER SARA O -->
<Key
- latin:keyLabel="ฬ"
+ latin:keyLabel="โ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0E26: "ฦ" THAI CHARACTER LU -->
+ <!-- U+0E0C: "ฌ" THAI CHARACTER CHO CHOE -->
<Key
- latin:keyLabel="ฦ"
+ 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: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. -->
@@ -64,46 +53,82 @@
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:code="0x0E4B"
+ latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ <!-- U+0E29: "ษ" THAI CHARACTER SO RUSI -->
+ <Key
+ latin:keyLabel="ษ"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0E28: "ศ" THAI CHARACTER SO SALA -->
+ <Key
+ latin:keyLabel="ศ"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0E0B: "ซ" THAI CHARACTER SO SO -->
+ <Key
+ latin:keyLabel="ซ"
+ latin:keyLabelFlags="fontNormal" />
+ <Key
+ latin:keyLabel="." />
</case>
<default>
- <!-- U+0E1C: "ผ" THAI CHARACTER PHO PHUNG -->
+ <!-- U+0E1F: "ฟ" THAI CHARACTER FO FAN -->
<Key
- latin:keyLabel="ผ"
+ latin:keyLabel="ฟ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0E1B: "ป" THAI CHARACTER PO PLA
- U+0E1A: "บ" THAI CHARACTER BO BAIMAI -->
+ <!-- U+0E2B: "ห" THAI CHARACTER HO HIP -->
<Key
- latin:keyLabel="ป"
- latin:moreKeys="บ"
+ latin:keyLabel="ห"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0E2D: "อ" THAI CHARACTER O ANG -->
+ <!-- U+0E01: "ก" THAI CHARACTER KO KAI -->
<Key
- latin:keyLabel="อ"
+ latin:keyLabel="ก"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0E17: "ท" THAI CHARACTER THO THAHAN -->
+ <!-- U+0E14: "ด" THAI CHARACTER DO DEK -->
<Key
- latin:keyLabel="ท"
+ latin:keyLabel="ด"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0E21: "ม" THAI CHARACTER MO MA -->
+ <!-- U+0E40: "เ" THAI CHARACTER SARA E -->
<Key
- latin:keyLabel="ม"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E1D: "ฝ" THAI CHARACTER FO FA -->
- <Key
- latin:keyLabel="ฝ"
+ 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 -->
+ 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=" ้"
+ 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:code="0x0E48"
- latin:moreKeys="้,๊,๋"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ <!-- U+0E32: "า" THAI CHARACTER SARA AA -->
+ <Key
+ latin:keyLabel="า"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0E2A: "ส" THAI CHARACTER SO SUA -->
+ <Key
+ latin:keyLabel="ส"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0E27: "ว" THAI CHARACTER WO WAEN -->
+ <Key
+ latin:keyLabel="ว"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0E07: "ง" THAI CHARACTER NGO NGU -->
+ <Key
+ latin:keyLabel="ง"
+ latin:keyLabelFlags="fontNormal" />
</default>
</switch>
</merge>