From ab5f9532dbd1ac0469cab32cf97d87f25f45d8b0 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Mon, 3 Sep 2012 11:26:45 +0900
Subject: [PATCH] Use 5-row layout for Thai phone keybopard
Bug: 6911182
Change-Id: I78f59564e8c31b9b66ed9a136584d0c57cc43120
---
java/res/xml-sw600dp/kbd_thai.xml | 31 ----
java/res/xml-sw600dp/rowkeys_thai1.xml | 130 ---------------
java/res/xml-sw600dp/rowkeys_thai2.xml | 148 ------------------
java/res/xml-sw600dp/rowkeys_thai3.xml | 134 ----------------
java/res/xml-sw600dp/rows_thai.xml | 9 +-
java/res/xml-sw768dp-land/kbd_thai.xml | 31 ----
.../res/xml-sw768dp-land/kbd_thai_symbols.xml | 31 ----
.../kbd_thai_symbols_shift.xml | 31 ----
java/res/xml-sw768dp/kbd_thai.xml | 31 ----
java/res/xml-sw768dp/rows_thai.xml | 6 +-
java/res/xml/kbd_thai.xml | 5 +
.../key_thai_kho_khuat.xml} | 27 ++--
java/res/xml/rowkeys_thai1.xml | 118 +++++++-------
java/res/xml/rowkeys_thai2.xml | 133 ++++++++--------
java/res/xml/rowkeys_thai3.xml | 103 +++++++-----
.../{xml-sw600dp => xml}/rowkeys_thai4.xml | 0
java/res/xml/rows_thai.xml | 27 ++--
.../inputmethod/keyboard/KeyboardView.java | 2 +-
18 files changed, 238 insertions(+), 759 deletions(-)
delete mode 100644 java/res/xml-sw600dp/kbd_thai.xml
delete mode 100644 java/res/xml-sw600dp/rowkeys_thai1.xml
delete mode 100644 java/res/xml-sw600dp/rowkeys_thai2.xml
delete mode 100644 java/res/xml-sw600dp/rowkeys_thai3.xml
delete mode 100644 java/res/xml-sw768dp-land/kbd_thai.xml
delete mode 100644 java/res/xml-sw768dp-land/kbd_thai_symbols.xml
delete mode 100644 java/res/xml-sw768dp-land/kbd_thai_symbols_shift.xml
delete mode 100644 java/res/xml-sw768dp/kbd_thai.xml
rename java/res/{xml-sw600dp-land/kbd_thai.xml => xml/key_thai_kho_khuat.xml} (56%)
rename java/res/{xml-sw600dp => xml}/rowkeys_thai4.xml (100%)
diff --git a/java/res/xml-sw600dp/kbd_thai.xml b/java/res/xml-sw600dp/kbd_thai.xml
deleted file mode 100644
index b4a4a0b925..0000000000
--- a/java/res/xml-sw600dp/kbd_thai.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:rowHeight="20%p"
- 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
- latin:keyboardLayout="@xml/rows_thai" />
-</Keyboard>
diff --git a/java/res/xml-sw600dp/rowkeys_thai1.xml b/java/res/xml-sw600dp/rowkeys_thai1.xml
deleted file mode 100644
index 842bf05eea..0000000000
--- a/java/res/xml-sw600dp/rowkeys_thai1.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <switch>
- <case
- latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
- <!-- U+0E51: "๑" THAI DIGIT ONE -->
- <Key
- latin:keyLabel="๑"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E52: "๒" THAI DIGIT TWO -->
- <Key
- latin:keyLabel="๒"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E53: "๓" THAI DIGIT THREE -->
- <Key
- latin:keyLabel="๓"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E54: "๔" THAI DIGIT FOUR -->
- <Key
- 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:code="0x0E39"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
- <!-- U+0E3F: "฿" THAI CURRENCY SYMBOL BAHT -->
- <Key
- latin:keyLabel="฿"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E55: "๕" THAI DIGIT FIVE -->
- <Key
- latin:keyLabel="๕"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E56: "๖" THAI DIGIT SIX -->
- <Key
- latin:keyLabel="๖"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E57: "๗" THAI DIGIT SEVEN -->
- <Key
- latin:keyLabel="๗"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E58: "๘" THAI DIGIT EIGHT -->
- <Key
- latin:keyLabel="๘"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E59: "๙" THAI DIGIT NINE -->
- <Key
- latin:keyLabel="๙"
- latin:keyLabelFlags="fontNormal" />
- </case>
- <default>
- <!-- U+0E45: "ๅ" THAI CHARACTER LAKKHANGYAO -->
- <Key
- latin:keyLabel="ๅ"
- latin:keyLabelFlags="fontNormal" />
- <Key
- latin:keyLabel="/" />
- <!-- U+0E20: "ภ" THAI CHARACTER PHO SAMPHAO -->
- <Key
- latin:keyLabel="ภ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E16: "ถ" THAI CHARACTER THO THUNG -->
- <Key
- 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=" ุ"
- 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:code="0x0E36"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
- <!-- U+0E04: "ค" THAI CHARACTER KHO KHWAI -->
- <Key
- latin:keyLabel="ค"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E15: "ต" THAI CHARACTER TO TAO -->
- <Key
- latin:keyLabel="ต"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E08: "จ" THAI CHARACTER CHO CHAN -->
- <Key
- latin:keyLabel="จ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E02: "ข" THAI CHARACTER KHO KHAI -->
- <Key
- latin:keyLabel="ข"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E0A: "ช" THAI CHARACTER CHO CHANG -->
- <Key
- latin:keyLabel="ช"
- latin:keyLabelFlags="fontNormal" />
- </default>
- </switch>
-</merge>
diff --git a/java/res/xml-sw600dp/rowkeys_thai2.xml b/java/res/xml-sw600dp/rowkeys_thai2.xml
deleted file mode 100644
index 71ab2c9dff..0000000000
--- a/java/res/xml-sw600dp/rowkeys_thai2.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <switch>
- <case
- latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
- <!-- U+0E50: "à¹" THAI DIGIT ZERO -->
- <Key
- latin:keyLabel="๐"
- latin:keyLabelFlags="fontNormal" />
- <Key
- latin:keyLabel=""" />
- <!-- U+0E0E: "ฎ" THAI CHARACTER DO CHADA -->
- <Key
- latin:keyLabel="ฎ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E11: "ฑ" THAI CHARACTER THO NANGMONTHO -->
- <Key
- latin:keyLabel="ฑ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E18: "ธ" THAI CHARACTER THO THONG -->
- <Key
- latin:keyLabel="ธ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0020: " " SPACE
- U+0E4D: " à¹" THAI CHARACTER THANTHAKHAT -->
- <!-- Note: The space character is needed as a preceding letter to draw some Thai
- composing characters correctly. -->
- <Key
- latin:keyLabel=" ํ"
- latin:code="0x0E4D"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
- <!-- U+0020: " " SPACE
- U+0E4A: " ๊" THAI CHARACTER MAI TRI -->
- <!-- Note: The space character is needed as a preceding letter to draw some Thai
- composing characters correctly. -->
- <Key
- latin:keyLabel=" ๊"
- latin:code="0x0E4A"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
- <!-- U+0E13: "ณ" THAI CHARACTER NO NEN -->
- <Key
- latin:keyLabel="ณ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E2F: "ฯ" THAI CHARACTER PAIYANNOI -->
- <Key
- latin:keyLabel="ฯ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E0D: "à¸" THAI CHARACTER YO YING -->
- <Key
- latin:keyLabel="ญ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E10: "à¸" THAI CHARACTER THO THAN -->
- <Key
- latin:keyLabel="ฐ"
- latin:keyLabelFlags="fontNormal" />
- <Key
- latin:keyLabel="," />
- <!-- U+0E05: "ฅ" THAI CHARACTER KHO KHON -->
- <Key
- latin:keyLabel="ฅ"
- latin:keyLabelFlags="fontNormal" />
- </case>
- <default>
- <!-- U+0E46: "ๆ" THAI CHARACTER MAIYAMOK -->
- <Key
- latin:keyLabel="ๆ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E44: "ไ" THAI CHARACTER SARA AI MAIMALAI -->
- <Key
- latin:keyLabel="ไ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E33: "ำ" THAI CHARACTER SARA AM -->
- <Key
- latin:keyLabel="ำ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E1E: "พ" THAI CHARACTER PHO PHAN -->
- <Key
- latin:keyLabel="พ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E30: "ะ" THAI CHARACTER SARA A -->
- <Key
- latin:keyLabel="ะ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0020: " " SPACE
- U+0E31: " ั" THAI CHARACTER MAI HAN-AKAT -->
- <!-- Note: The space character is needed as a preceding letter to draw some Thai
- composing characters correctly. -->
- <Key
- latin:keyLabel=" ั"
- latin:code="0x0E31"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
- <!-- U+0020: " " SPACE
- U+0E35: " ี" HAI CHARACTER SARA II -->
- <!-- Note: The space character is needed as a preceding letter to draw some Thai
- composing characters correctly. -->
- <Key
- latin:keyLabel=" ี"
- latin:code="0x0E35"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
- <!-- U+0E23: "ร" THAI CHARACTER RO RUA -->
- <Key
- latin:keyLabel="ร"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E19: "น" THAI CHARACTER NO NU -->
- <Key
- latin:keyLabel="น"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E22: "ย" THAI CHARACTER YO YAK -->
- <Key
- latin:keyLabel="ย"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E1A: "บ" THAI CHARACTER BO BAIMAI -->
- <Key
- latin:keyLabel="บ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E25: "ล" THAI CHARACTER LO LING -->
- <Key
- latin:keyLabel="ล"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E03: "ฃ" THAI CHARACTER KHO KHUAT -->
- <Key
- latin:keyLabel="ฃ"
- latin:keyLabelFlags="fontNormal" />
- </default>
- </switch>
-</merge>
diff --git a/java/res/xml-sw600dp/rowkeys_thai3.xml b/java/res/xml-sw600dp/rowkeys_thai3.xml
deleted file mode 100644
index b9d1475ab0..0000000000
--- a/java/res/xml-sw600dp/rowkeys_thai3.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <switch>
- <case
- latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
- <!-- U+0E24: "ฤ" THAI CHARACTER RU -->
- <Key
- latin:keyLabel="ฤ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E06: "ฆ" THAI CHARACTER KHO RAKHANG -->
- <Key
- latin:keyLabel="ฆ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E0F: "à¸" THAI CHARACTER TO PATAK -->
- <Key
- latin:keyLabel="ฏ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E42: "โ" THAI CHARACTER SARA O -->
- <Key
- latin:keyLabel="โ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E0C: "ฌ" THAI CHARACTER CHO CHOE -->
- <Key
- latin:keyLabel="ฌ"
- latin:keyLabelFlags="fontNormal" />
- <!-- 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: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+0E1F: "ฟ" THAI CHARACTER FO FAN -->
- <Key
- latin:keyLabel="ฟ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E2B: "ห" THAI CHARACTER HO HIP -->
- <Key
- latin:keyLabel="ห"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E01: "à¸" THAI CHARACTER KO KAI -->
- <Key
- latin:keyLabel="ก"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E14: "ด" THAI CHARACTER DO DEK -->
- <Key
- latin:keyLabel="ด"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E40: "เ" THAI CHARACTER SARA E -->
- <Key
- latin:keyLabel="เ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0020: " " SPACE
- 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: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>
diff --git a/java/res/xml-sw600dp/rows_thai.xml b/java/res/xml-sw600dp/rows_thai.xml
index c1fe55b39e..bc89640aca 100644
--- a/java/res/xml-sw600dp/rows_thai.xml
+++ b/java/res/xml-sw600dp/rows_thai.xml
@@ -27,8 +27,7 @@
latin:keyWidth="7.5%p"
>
<include
- latin:keyboardLayout="@xml/rowkeys_thai1"
- latin:keyXPos="3.75%p" />
+ latin:keyboardLayout="@xml/rowkeys_thai1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
@@ -38,14 +37,16 @@
>
<include
latin:keyboardLayout="@xml/rowkeys_thai2"
- latin:keyXPos="0.719%p" />
+ latin:keyXPos="2.5%p" />
+ <include
+ latin:keyboardLayout="@xml/key_thai_kho_khuat" />
</Row>
<Row
latin:keyWidth="7.5%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_thai3"
- latin:keyXPos="3.75%p" />
+ latin:keyXPos="5.0%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
diff --git a/java/res/xml-sw768dp-land/kbd_thai.xml b/java/res/xml-sw768dp-land/kbd_thai.xml
deleted file mode 100644
index b4a4a0b925..0000000000
--- a/java/res/xml-sw768dp-land/kbd_thai.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:rowHeight="20%p"
- 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
- latin:keyboardLayout="@xml/rows_thai" />
-</Keyboard>
diff --git a/java/res/xml-sw768dp-land/kbd_thai_symbols.xml b/java/res/xml-sw768dp-land/kbd_thai_symbols.xml
deleted file mode 100644
index 0cd9a61ea8..0000000000
--- a/java/res/xml-sw768dp-land/kbd_thai_symbols.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:rowHeight="20%p"
- 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
- latin:keyboardLayout="@xml/rows_thai_symbols" />
-</Keyboard>
diff --git a/java/res/xml-sw768dp-land/kbd_thai_symbols_shift.xml b/java/res/xml-sw768dp-land/kbd_thai_symbols_shift.xml
deleted file mode 100644
index a68fec458b..0000000000
--- a/java/res/xml-sw768dp-land/kbd_thai_symbols_shift.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:rowHeight="20%p"
- 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
- latin:keyboardLayout="@xml/rows_thai_symbols_shift" />
-</Keyboard>
diff --git a/java/res/xml-sw768dp/kbd_thai.xml b/java/res/xml-sw768dp/kbd_thai.xml
deleted file mode 100644
index b4a4a0b925..0000000000
--- a/java/res/xml-sw768dp/kbd_thai.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:rowHeight="20%p"
- 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
- latin:keyboardLayout="@xml/rows_thai" />
-</Keyboard>
diff --git a/java/res/xml-sw768dp/rows_thai.xml b/java/res/xml-sw768dp/rows_thai.xml
index 7721bc5a93..5f9b383f83 100644
--- a/java/res/xml-sw768dp/rows_thai.xml
+++ b/java/res/xml-sw768dp/rows_thai.xml
@@ -28,7 +28,7 @@
>
<include
latin:keyboardLayout="@xml/rowkeys_thai1"
- latin:keyXPos="11.508%p" />
+ latin:keyXPos="3.799%p" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight"/>
@@ -42,9 +42,11 @@
latin:keyWidth="7.969%p" />
<include
latin:keyboardLayout="@xml/rowkeys_thai2" />
+ <include
+ latin:keyboardLayout="@xml/key_thai_kho_khuat" />
</Row>
<Row
- latin:keyWidth="7.125%p"
+ latin:keyWidth="7.079%p"
>
<Key
latin:keyStyle="toSymbolKeyStyle"
diff --git a/java/res/xml/kbd_thai.xml b/java/res/xml/kbd_thai.xml
index 058ca16a3e..b4a4a0b925 100644
--- a/java/res/xml/kbd_thai.xml
+++ b/java/res/xml/kbd_thai.xml
@@ -20,6 +20,11 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
+ latin:rowHeight="20%p"
+ 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
latin:keyboardLayout="@xml/rows_thai" />
diff --git a/java/res/xml-sw600dp-land/kbd_thai.xml b/java/res/xml/key_thai_kho_khuat.xml
similarity index 56%
rename from java/res/xml-sw600dp-land/kbd_thai.xml
rename to java/res/xml/key_thai_kho_khuat.xml
index b4a4a0b925..0ffd0f9249 100644
--- a/java/res/xml-sw600dp-land/kbd_thai.xml
+++ b/java/res/xml/key_thai_kho_khuat.xml
@@ -18,14 +18,23 @@
*/
-->
-<Keyboard
+<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:rowHeight="20%p"
- 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
- latin:keyboardLayout="@xml/rows_thai" />
-</Keyboard>
+ <switch>
+ <case
+ latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
+ >
+ <!-- U+0E05: "ฅ" THAI CHARACTER KHO KHON -->
+ <Key
+ latin:keyLabel="ฅ"
+ latin:keyLabelFlags="fontNormal" />
+ </case>
+ <default>
+ <!-- U+0E03: "ฃ" THAI CHARACTER KHO KHUAT -->
+ <Key
+ latin:keyLabel="ฃ"
+ latin:keyLabelFlags="fontNormal" />
+ </default>
+ </switch>
+</merge>
diff --git a/java/res/xml/rowkeys_thai1.xml b/java/res/xml/rowkeys_thai1.xml
index e175befb3b..950d2a4569 100644
--- a/java/res/xml/rowkeys_thai1.xml
+++ b/java/res/xml/rowkeys_thai1.xml
@@ -25,119 +25,109 @@
<case
latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
>
- <!-- U+0E0E: "ฎ" THAI CHARACTER DO CHADA -->
<Key
- latin:keyLabel="ฎ"
+ latin:keyLabel="+" />
+ <!-- U+0E51: "๑" THAI DIGIT ONE -->
+ <Key
+ latin:keyLabel="๑"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0E11: "ฑ" THAI CHARACTER THO NANGMONTHO -->
+ <!-- U+0E52: "๒" THAI DIGIT TWO -->
<Key
- latin:keyLabel="ฑ"
+ latin:keyLabel="๒"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0E18: "ธ" THAI CHARACTER THO THONG -->
+ <!-- U+0E53: "๓" THAI DIGIT THREE -->
<Key
- latin:keyLabel="ธ"
+ latin:keyLabel="๓"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0E13: "ณ" THAI CHARACTER NO NEN -->
+ <!-- U+0E54: "๔" THAI DIGIT FOUR -->
<Key
- latin:keyLabel="ณ"
+ latin:keyLabel="๔"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0E0D: "à¸" THAI CHARACTER YO YING -->
+ <!-- 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:keyLabelFlags="fontNormal" />
- <!-- U+0E10: "à¸" THAI CHARACTER THO THAN -->
+ <!-- U+0E55: "๕" THAI DIGIT FIVE -->
<Key
- latin:keyLabel="ฐ"
+ latin:keyLabel="๕"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0E03: "ฃ" THAI CHARACTER KHO KHUAT -->
+ <!-- U+0E56: "๖" THAI DIGIT SIX -->
<Key
- latin:keyLabel="ฃ"
+ latin:keyLabel="๖"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0E05: "ฅ" THAI CHARACTER KHO KHON -->
+ <!-- U+0E57: "๗" THAI DIGIT SEVEN -->
<Key
- latin:keyLabel="ฅ"
+ latin:keyLabel="๗"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0E51: "๑" THAI DIGIT ONE
- U+0E52: "๒" THAI DIGIT TWO
- U+0E53: "๓" THAI DIGIT THREE
- U+0E54: "๔" THAI DIGIT FOUR
- U+0E55: "๕" THAI DIGIT FIVE -->
+ <!-- U+0E58: "๘" THAI DIGIT EIGHT -->
<Key
- latin:keyLabel="๑"
- latin:moreKeys="!fixedColumnOrder!4,๒,๓,๔,๕"
+ latin:keyLabel="๘"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0E56: "๖" THAI DIGIT SIX
- U+0E57: "๗" THAI DIGIT SEVEN
- U+0E58: "๘" THAI DIGIT EIGHT
- U+0E59: "๙" THAI DIGIT NINE
- U+0E50: "à¹" THAI DIGIT ZERO -->
+ <!-- U+0E59: "๙" THAI DIGIT NINE -->
<Key
- latin:keyLabel="๖"
- latin:moreKeys="!fixedColumnOrder!4,๗,๘,๙,๐"
+ latin:keyLabel="๙"
latin:keyLabelFlags="fontNormal" />
</case>
<default>
+ <!-- U+0E45: "ๅ" THAI CHARACTER LAKKHANGYAO -->
+ <Key
+ latin:keyLabel="ๅ"
+ latin:keyLabelFlags="fontNormal" />
+ <Key
+ latin:keyLabel="/" />
+ <Key
+ latin:keyLabel="_" />
<!-- U+0E20: "ภ" THAI CHARACTER PHO SAMPHAO -->
<Key
latin:keyLabel="ภ"
- latin:keyHintLabel="1"
- latin:additionalMoreKeys="1,๑"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E16: "ถ" THAI CHARACTER THO THUNG -->
<Key
latin:keyLabel="ถ"
- latin:keyHintLabel="2"
- latin:additionalMoreKeys="2,๒"
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=" ุ"
+ 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:code="0x0E36"
+ latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0E04: "ค" THAI CHARACTER KHO KHWAI -->
<Key
latin:keyLabel="ค"
- latin:keyHintLabel="3"
- latin:additionalMoreKeys="3,๓"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E15: "ต" THAI CHARACTER TO TAO -->
<Key
latin:keyLabel="ต"
- latin:keyHintLabel="4"
- latin:additionalMoreKeys="4,๔"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E08: "จ" THAI CHARACTER CHO CHAN -->
<Key
latin:keyLabel="จ"
- latin:keyHintLabel="5"
- latin:additionalMoreKeys="5,๕"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E02: "ข" THAI CHARACTER KHO KHAI -->
<Key
latin:keyLabel="ข"
- latin:keyHintLabel="6"
- latin:additionalMoreKeys="6,๖"
latin:keyLabelFlags="fontNormal" />
<!-- U+0E0A: "ช" THAI CHARACTER CHO CHANG -->
<Key
latin:keyLabel="ช"
- latin:keyHintLabel="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:keyLabelFlags="fontNormal" />
- <!-- U+0E19: "น" THAI CHARACTER NO NU -->
- <Key
- latin:keyLabel="น"
- latin:keyHintLabel="9"
- latin:additionalMoreKeys="9,๙"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E22: "ย" THAI CHARACTER YO YAK -->
- <Key
- latin:keyLabel="ย"
- latin:keyHintLabel="0"
- latin:additionalMoreKeys="0,๐"
latin:keyLabelFlags="fontNormal" />
</default>
</switch>
diff --git a/java/res/xml/rowkeys_thai2.xml b/java/res/xml/rowkeys_thai2.xml
index f5fd405e4c..f602994b98 100644
--- a/java/res/xml/rowkeys_thai2.xml
+++ b/java/res/xml/rowkeys_thai2.xml
@@ -25,105 +25,116 @@
<case
latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
>
- <!-- U+0E24: "ฤ" THAI CHARACTER RU -->
+ <!-- U+0E50: "à¹" THAI DIGIT ZERO -->
<Key
- latin:keyLabel="ฤ"
+ latin:keyLabel="๐"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0E06: "ฆ" THAI CHARACTER KHO RAKHANG -->
<Key
- latin:keyLabel="ฆ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E0F: "à¸" THAI CHARACTER TO PATAK -->
+ latin:keyLabel=""" />
+ <!-- U+0E0E: "ฎ" THAI CHARACTER DO CHADA -->
<Key
- latin:keyLabel="ฏ"
+ latin:keyLabel="ฎ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0E0C: "ฌ" THAI CHARACTER CHO CHOE -->
+ <!-- U+0E11: "ฑ" THAI CHARACTER THO NANGMONTHO -->
<Key
- latin:keyLabel="ฌ"
+ latin:keyLabel="ฑ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0E29: "ษ" THAI CHARACTER SO RUSI -->
+ <!-- U+0E18: "ธ" THAI CHARACTER THO THONG -->
<Key
- latin:keyLabel="ษ"
+ latin:keyLabel="ธ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0E28: "ศ" THAI CHARACTER SO SALA -->
+ <!-- U+0020: " " SPACE
+ U+0E4D: " à¹" THAI CHARACTER THANTHAKHAT -->
+ <!-- Note: The space character is needed as a preceding letter to draw some Thai
+ composing characters correctly. -->
<Key
- latin:keyLabel="ศ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E0B: "ซ" THAI CHARACTER SO SO -->
+ latin:keyLabel=" ํ"
+ latin:code="0x0E4D"
+ latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ <!-- U+0020: " " SPACE
+ U+0E4A: " ๊" THAI CHARACTER MAI TRI -->
+ <!-- Note: The space character is needed as a preceding letter to draw some Thai
+ composing characters correctly. -->
<Key
- latin:keyLabel="ซ"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E3F: "฿" THAI CURRENCY SYMBOL BAHT
- U+0E45: "ๅ" THAI CHARACTER LAKKHANGYAO -->
+ latin:keyLabel=" ๊"
+ latin:code="0x0E4A"
+ latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ <!-- U+0E13: "ณ" THAI CHARACTER NO NEN -->
<Key
- latin:keyLabel="฿"
- latin:moreKeys="ๅ"
+ latin:keyLabel="ณ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0E46: "ๆ" THAI CHARACTER MAIYAMOK
- U+0E2F: "ฯ" THAI CHARACTER PAIYANNOI -->
+ <!-- U+0E2F: "ฯ" THAI CHARACTER PAIYANNOI -->
<Key
- latin:keyLabel="ๆ"
- latin:moreKeys="ฯ"
+ latin:keyLabel="ฯ"
latin:keyLabelFlags="fontNormal" />
- </case>
- <default>
- <!-- U+0E1F: "ฟ" THAI CHARACTER FO FAN
- U+0E1E: "พ" THAI CHARACTER PHO PHAN -->
+ <!-- U+0E0D: "à¸" THAI CHARACTER YO YING -->
<Key
- latin:keyLabel="ฟ"
- latin:moreKeys="พ"
+ latin:keyLabel="ญ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0E2B: "ห" THAI CHARACTER HO HIP -->
+ <!-- U+0E10: "à¸" THAI CHARACTER THO THAN -->
<Key
- latin:keyLabel="ห"
+ latin:keyLabel="ฐ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0E01: "à¸" THAI CHARACTER KO KAI -->
<Key
- latin:keyLabel="ก"
- latin:keyLabelFlags="fontNormal" />
- <!-- U+0E14: "ด" THAI CHARACTER DO DEK -->
+ latin:keyLabel="," />
+ </case>
+ <default>
+ <!-- U+0E46: "ๆ" THAI CHARACTER MAIYAMOK -->
<Key
- latin:keyLabel="ด"
+ latin:keyLabel="ๆ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0E2A: "ส" THAI CHARACTER SO SUA -->
+ <!-- U+0E44: "ไ" THAI CHARACTER SARA AI MAIMALAI -->
<Key
- latin:keyLabel="ส"
+ latin:keyLabel="ไ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0E27: "ว" THAI CHARACTER WO WAEN -->
+ <!-- U+0E33: "ำ" THAI CHARACTER SARA AM -->
<Key
- latin:keyLabel="ว"
+ latin:keyLabel="ำ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0E07: "ง" THAI CHARACTER NGO NGU -->
+ <!-- U+0E1E: "พ" THAI CHARACTER PHO PHAN -->
<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
- U+0E40: "เ" THAI CHARACTER SARA E
- U+0E41: "à¹" THAI CHARACTER SARA AE
- U+0E43: "ใ" THAI CHARACTER SARA AI MAIMUAN
- U+0E44: "ไ" THAI CHARACTER SARA AI MAIMALAI
- U+0E42: "โ" THAI CHARACTER SARA O -->
+ <!-- U+0E30: "ะ" THAI CHARACTER SARA A -->
<Key
latin:keyLabel="ะ"
- 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 -->
+ U+0E31: " ั" THAI CHARACTER MAI HAN-AKAT -->
<!-- Note: The space character is needed as a preceding letter to draw some Thai
composing characters correctly. -->
<Key
latin:keyLabel=" ั"
latin:code="0x0E31"
- latin:moreKeys="ิ,ี,ึ,ื,ุ,ู"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ <!-- U+0020: " " SPACE
+ U+0E35: " ี" HAI CHARACTER SARA II -->
+ <!-- Note: The space character is needed as a preceding letter to draw some Thai
+ composing characters correctly. -->
+ <Key
+ latin:keyLabel=" ี"
+ latin:code="0x0E35"
+ latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ <!-- U+0E23: "ร" THAI CHARACTER RO RUA -->
+ <Key
+ latin:keyLabel="ร"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0E19: "น" THAI CHARACTER NO NU -->
+ <Key
+ latin:keyLabel="น"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0E22: "ย" THAI CHARACTER YO YAK -->
+ <Key
+ latin:keyLabel="ย"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0E1A: "บ" THAI CHARACTER BO BAIMAI -->
+ <Key
+ latin:keyLabel="บ"
+ latin:keyLabelFlags="fontNormal" />
+ <!-- U+0E25: "ล" THAI CHARACTER LO LING -->
+ <Key
+ latin:keyLabel="ล"
+ latin:keyLabelFlags="fontNormal" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/rowkeys_thai3.xml b/java/res/xml/rowkeys_thai3.xml
index 2fcc0068a7..7b6e6372ec 100644
--- a/java/res/xml/rowkeys_thai3.xml
+++ b/java/res/xml/rowkeys_thai3.xml
@@ -25,85 +25,110 @@
<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 -->
+ 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:code="0x0E4C"
- latin:moreKeys="ํ,ฺ"
+ latin:keyLabel=" ็"
+ latin:code="0x0E47"
latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- U+0020: " " SPACE
- U+0E47: " ็" THAI CHARACTER MAITAIKHU -->
+ 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="0x0E47"
+ 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:keyLabel="เ"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0E1D: "à¸" THAI CHARACTER FO FA -->
+ <!-- U+0020: " " SPACE
+ 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:keyLabelFlags="fontNormal" />
+ latin:keyLabel=" ้"
+ latin:code="0x0E49"
+ latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
<!-- 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+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>
diff --git a/java/res/xml-sw600dp/rowkeys_thai4.xml b/java/res/xml/rowkeys_thai4.xml
similarity index 100%
rename from java/res/xml-sw600dp/rowkeys_thai4.xml
rename to java/res/xml/rowkeys_thai4.xml
diff --git a/java/res/xml/rows_thai.xml b/java/res/xml/rows_thai.xml
index 6b80df6400..108b7e1fc9 100644
--- a/java/res/xml/rows_thai.xml
+++ b/java/res/xml/rows_thai.xml
@@ -24,31 +24,34 @@
<include
latin:keyboardLayout="@xml/key_styles_common" />
<Row
- latin:keyWidth="10%p"
+ latin:keyWidth="8.3333%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_thai1" />
</Row>
<Row
- latin:keyWidth="10%p"
+ latin:keyWidth="8.3333%p"
>
<include
- latin:keyboardLayout="@xml/rowkeys_thai2"
- latin:keyXPos="5%p" />
+ latin:keyboardLayout="@xml/rowkeys_thai2" />
</Row>
<Row
- latin:keyWidth="10%p"
+ latin:keyWidth="8.3333%p"
>
- <Key
- latin:keyStyle="shiftKeyStyle"
- latin:keyWidth="15%p"
- latin:visualInsetsRight="1%p" />
<include
latin:keyboardLayout="@xml/rowkeys_thai3" />
+ <include
+ latin:keyboardLayout="@xml/key_thai_kho_khuat" />
+ </Row>
+ <Row
+ latin:keyWidth="8.3333%p"
+ >
+ <Key
+ latin:keyStyle="shiftKeyStyle" />
+ <include
+ latin:keyboardLayout="@xml/rowkeys_thai4" />
<Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyWidth="fillRight"
- latin:visualInsetsLeft="1%p" />
+ latin:keyStyle="deleteKeyStyle" />
</Row>
<include
latin:keyboardLayout="@xml/row_qwerty4" />
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
index 0b4d706321..5b02f9f5a2 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
@@ -647,7 +647,7 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy {
// Draw key icon.
if (key.mLabel == null && icon != null) {
- final int iconWidth = icon.getIntrinsicWidth();
+ final int iconWidth = Math.min(icon.getIntrinsicWidth(), keyWidth);
final int iconHeight = icon.getIntrinsicHeight();
final int iconX, alignX;
final int iconY = (keyHeight - iconHeight) / 2;
--
GitLab