diff options
Diffstat (limited to 'java/res/xml-sw600dp')
| -rw-r--r-- | java/res/xml-sw600dp/kbd_thai.xml | 29 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/rowkeys_arabic1.xml | 33 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/rowkeys_arabic2.xml | 33 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/rowkeys_arabic3.xml | 33 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/rowkeys_farsi1.xml | 36 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/rowkeys_farsi2.xml | 33 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/rowkeys_farsi3.xml | 30 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/rowkeys_thai1.xml | 97 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/rowkeys_thai2.xml | 108 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/rowkeys_thai3.xml | 97 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/rowkeys_thai4.xml | 89 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/rows_thai.xml | 9 |
12 files changed, 137 insertions, 490 deletions
diff --git a/java/res/xml-sw600dp/kbd_thai.xml b/java/res/xml-sw600dp/kbd_thai.xml deleted file mode 100644 index b75980f2f..000000000 --- a/java/res/xml-sw600dp/kbd_thai.xml +++ /dev/null @@ -1,29 +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="3.20%p" - latin:touchPositionCorrectionData="@null" -> - <include - latin:keyboardLayout="@xml/rows_thai" /> -</Keyboard> diff --git a/java/res/xml-sw600dp/rowkeys_arabic1.xml b/java/res/xml-sw600dp/rowkeys_arabic1.xml index 44fdc676d..6a0e25786 100644 --- a/java/res/xml-sw600dp/rowkeys_arabic1.xml +++ b/java/res/xml-sw600dp/rowkeys_arabic1.xml @@ -23,19 +23,23 @@ > <!-- U+0636: "ض" ARABIC LETTER DAD --> <Key - latin:keyLabel="ض" /> + latin:keyLabel="ض" + latin:keyLabelFlags="fontNormal" /> <!-- U+0635: "ص" ARABIC LETTER SAD --> <Key - latin:keyLabel="ص" /> + latin:keyLabel="ص" + latin:keyLabelFlags="fontNormal" /> <!-- U+062B: "ث" ARABIC LETTER THEH --> <Key - latin:keyLabel="ث" /> + latin:keyLabel="ث" + latin:keyLabelFlags="fontNormal" /> <!-- U+0642: "ق" ARABIC LETTER QAF U+06A8: "ڨ" ARABIC LETTER QAF WITH THREE DOTS ABOVE --> <!-- TODO: DroidSansArabic lacks the glyph of U+06A8 ARABIC LETTER QAF WITH THREE DOTS ABOVE --> <Key latin:keyLabel="ق" - latin:moreKeys="ڨ" /> + latin:moreKeys="ڨ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0641: "ف" ARABIC LETTER FEH U+06A4: "ڤ" ARABIC LETTER VEH U+06A2: "ڢ" ARABIC LETTER FEH WITH DOT MOVED BELOW @@ -44,28 +48,35 @@ <!-- TODO: DroidSansArabic lacks the glyph of U+06A5 ARABIC LETTER FEH WITH THREE DOTS BELOW --> <Key latin:keyLabel="ف" - latin:moreKeys="ڤ,ڢ,ڥ" /> + latin:moreKeys="ڤ,ڢ,ڥ" + latin:keyLabelFlags="fontNormal" /> <!-- U+063A: "غ" ARABIC LETTER GHAIN --> <Key - latin:keyLabel="غ" /> + latin:keyLabel="غ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0639: "ع" ARABIC LETTER AIN --> <Key - latin:keyLabel="ع" /> + latin:keyLabel="ع" + latin:keyLabelFlags="fontNormal" /> <!-- U+0647: "ه" ARABIC LETTER HEH U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM U+0647 U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER --> <Key latin:keyLabel="ه" - latin:moreKeys="ﻫ|ه‍" /> + latin:moreKeys="ﻫ|ه‍" + latin:keyLabelFlags="fontNormal" /> <!-- U+062E: "خ" ARABIC LETTER KHAH --> <Key - latin:keyLabel="خ" /> + latin:keyLabel="خ" + latin:keyLabelFlags="fontNormal" /> <!-- U+062D: "ح" ARABIC LETTER HAH --> <Key - latin:keyLabel="ح" /> + latin:keyLabel="ح" + latin:keyLabelFlags="fontNormal" /> <!-- U+062C: "ج" ARABIC LETTER JEEM U+0686: "چ" ARABIC LETTER TCHEH --> <Key latin:keyLabel="ج" - latin:moreKeys="چ" /> + latin:moreKeys="چ" + latin:keyLabelFlags="fontNormal" /> </merge> diff --git a/java/res/xml-sw600dp/rowkeys_arabic2.xml b/java/res/xml-sw600dp/rowkeys_arabic2.xml index 3eba2fbf3..00e69ace7 100644 --- a/java/res/xml-sw600dp/rowkeys_arabic2.xml +++ b/java/res/xml-sw600dp/rowkeys_arabic2.xml @@ -26,21 +26,25 @@ <!-- TODO: DroidSansArabic lacks the glyph of U+069C ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE --> <Key latin:keyLabel="ش" - latin:moreKeys="ڜ" /> + latin:moreKeys="ڜ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0633: "س" ARABIC LETTER SEEN --> <Key - latin:keyLabel="س" /> + latin:keyLabel="س" + latin:keyLabelFlags="fontNormal" /> <!-- U+064A: "ي" ARABIC LETTER YEH U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE U+0649: "ى" ARABIC LETTER ALEF MAKSURA --> <Key latin:keyLabel="ي" - latin:moreKeys="ئ,ى" /> + latin:moreKeys="ئ,ى" + latin:keyLabelFlags="fontNormal" /> <!-- U+0628: "ب" ARABIC LETTER BEH U+067E: "پ" ARABIC LETTER PEH --> <Key latin:keyLabel="ب" - latin:moreKeys="پ" /> + latin:moreKeys="پ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0644: "ل" ARABIC LETTER LAM U+FEFB: "ﻻ" ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM U+0627: "ا" ARABIC LETTER ALEF @@ -52,7 +56,8 @@ U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE --> <Key latin:keyLabel="ل" - latin:moreKeys="ﻻ|لا,ﻷ|لأ,ﻹ|لإ,ﻵ|لآ" /> + latin:moreKeys="ﻻ|لا,ﻷ|لأ,ﻹ|لإ,ﻵ|لآ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0627: "ا" ARABIC LETTER ALEF U+0621: "ء" ARABIC LETTER HAMZA U+0671: "ٱ" ARABIC LETTER ALEF WASLA @@ -61,23 +66,29 @@ U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE --> <Key latin:keyLabel="ا" - latin:moreKeys="ء,ٱ,أ,إ,آ" /> + latin:moreKeys="ء,ٱ,أ,إ,آ" + latin:keyLabelFlags="fontNormal" /> <!-- U+062A: "ت" ARABIC LETTER TEH --> <Key - latin:keyLabel="ت" /> + latin:keyLabel="ت" + latin:keyLabelFlags="fontNormal" /> <!-- U+0646: "ن" ARABIC LETTER NOON --> <Key - latin:keyLabel="ن" /> + latin:keyLabel="ن" + latin:keyLabelFlags="fontNormal" /> <!-- U+0645: "م" ARABIC LETTER MEEM --> <Key - latin:keyLabel="م" /> + latin:keyLabel="م" + latin:keyLabelFlags="fontNormal" /> <!-- U+0643: "ك" ARABIC LETTER KAF U+06AF: "گ" ARABIC LETTER GAF U+06A9: "ک" ARABIC LETTER KEHEH --> <Key latin:keyLabel="ك" - latin:moreKeys="گ,ک" /> + latin:moreKeys="گ,ک" + latin:keyLabelFlags="fontNormal" /> <!-- U+0637: "ط" ARABIC LETTER TAH --> <Key - latin:keyLabel="ط" /> + latin:keyLabel="ط" + latin:keyLabelFlags="fontNormal" /> </merge> diff --git a/java/res/xml-sw600dp/rowkeys_arabic3.xml b/java/res/xml-sw600dp/rowkeys_arabic3.xml index 911550f4a..b0bcd78d6 100644 --- a/java/res/xml-sw600dp/rowkeys_arabic3.xml +++ b/java/res/xml-sw600dp/rowkeys_arabic3.xml @@ -23,37 +23,48 @@ > <!-- U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE --> <Key - latin:keyLabel="ئ" /> + latin:keyLabel="ئ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0621: "ء" ARABIC LETTER HAMZA --> <Key - latin:keyLabel="ء" /> + latin:keyLabel="ء" + latin:keyLabelFlags="fontNormal" /> <!-- U+0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE --> <Key - latin:keyLabel="ؤ" /> + latin:keyLabel="ؤ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0631: "ر" ARABIC LETTER REH --> <Key - latin:keyLabel="ر" /> + latin:keyLabel="ر" + latin:keyLabelFlags="fontNormal" /> <!-- U+0630: "ذ" ARABIC LETTER THAL --> <Key - latin:keyLabel="ذ" /> + latin:keyLabel="ذ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0649: "ى" ARABIC LETTER ALEF MAKSURA --> <Key - latin:keyLabel="ى" /> + latin:keyLabel="ى" + latin:keyLabelFlags="fontNormal" /> <!-- U+0629: "ة" ARABIC LETTER TEH MARBUTA --> <Key - latin:keyLabel="ة" /> + latin:keyLabel="ة" + latin:keyLabelFlags="fontNormal" /> <!-- U+0648: "و" ARABIC LETTER WAW --> <Key - latin:keyLabel="و" /> + latin:keyLabel="و" + latin:keyLabelFlags="fontNormal" /> <!-- U+0632: "ز" ARABIC LETTER ZAIN U+0698: "ژ" ARABIC LETTER JEH --> <Key latin:keyLabel="ز" - latin:moreKeys="ژ" /> + latin:moreKeys="ژ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0638: "ظ" ARABIC LETTER ZAH --> <Key - latin:keyLabel="ظ" /> + latin:keyLabel="ظ" + latin:keyLabelFlags="fontNormal" /> <!-- U+062F: "د" ARABIC LETTER DAL --> <Key - latin:keyLabel="د" /> + latin:keyLabel="د" + latin:keyLabelFlags="fontNormal" /> </merge> diff --git a/java/res/xml-sw600dp/rowkeys_farsi1.xml b/java/res/xml-sw600dp/rowkeys_farsi1.xml index 53208f286..7b312404a 100644 --- a/java/res/xml-sw600dp/rowkeys_farsi1.xml +++ b/java/res/xml-sw600dp/rowkeys_farsi1.xml @@ -23,25 +23,32 @@ > <!-- U+0636: "ض" ARABIC LETTER DAD --> <Key - latin:keyLabel="ض" /> + latin:keyLabel="ض" + latin:keyLabelFlags="fontNormal" /> <!-- U+0635: "ص" ARABIC LETTER SAD --> <Key - latin:keyLabel="ص" /> + latin:keyLabel="ص" + latin:keyLabelFlags="fontNormal" /> <!-- U+062B: "ث" ARABIC LETTER THEH --> <Key - latin:keyLabel="ث" /> + latin:keyLabel="ث" + latin:keyLabelFlags="fontNormal" /> <!-- U+0642: "ق" ARABIC LETTER QAF --> <Key - latin:keyLabel="ق" /> + latin:keyLabel="ق" + latin:keyLabelFlags="fontNormal" /> <!-- U+0641: "ف" ARABIC LETTER FEH --> <Key - latin:keyLabel="ف" /> + latin:keyLabel="ف" + latin:keyLabelFlags="fontNormal" /> <!-- U+063A: "غ" ARABIC LETTER GHAIN --> <Key - latin:keyLabel="غ" /> + latin:keyLabel="غ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0639: "ع" ARABIC LETTER AIN --> <Key - latin:keyLabel="ع" /> + latin:keyLabel="ع" + latin:keyLabelFlags="fontNormal" /> <!-- U+0647: "ه" ARABIC LETTER HEH U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM U+0647/U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER @@ -49,17 +56,22 @@ U+0629: "ة" ARABIC LETTER TEH MARBUTA --> <Key latin:keyLabel="ه" - latin:moreKeys="ﻫ|ه‍,هٔ,ة,%" /> + latin:moreKeys="ﻫ|ه‍,هٔ,ة,%" + latin:keyLabelFlags="fontNormal" /> <!-- U+062E: "خ" ARABIC LETTER KHAH --> <Key - latin:keyLabel="خ" /> + latin:keyLabel="خ" + latin:keyLabelFlags="fontNormal" /> <!-- U+062D: "ح" ARABIC LETTER HAH --> <Key - latin:keyLabel="ح" /> + latin:keyLabel="ح" + latin:keyLabelFlags="fontNormal" /> <!-- U+062C: "ج" ARABIC LETTER JEEM --> <Key - latin:keyLabel="ج" /> + latin:keyLabel="ج" + latin:keyLabelFlags="fontNormal" /> <!-- U+0686: "چ" ARABIC LETTER TCHEH --> <Key - latin:keyLabel="چ" /> + latin:keyLabel="چ" + latin:keyLabelFlags="fontNormal" /> </merge> diff --git a/java/res/xml-sw600dp/rowkeys_farsi2.xml b/java/res/xml-sw600dp/rowkeys_farsi2.xml index 234f98430..3b759b66c 100644 --- a/java/res/xml-sw600dp/rowkeys_farsi2.xml +++ b/java/res/xml-sw600dp/rowkeys_farsi2.xml @@ -23,10 +23,12 @@ > <!-- U+0634: "ش" ARABIC LETTER SHEEN --> <Key - latin:keyLabel="ش" /> + latin:keyLabel="ش" + latin:keyLabelFlags="fontNormal" /> <!-- U+0633: "س" ARABIC LETTER SEEN --> <Key - latin:keyLabel="س" /> + latin:keyLabel="س" + latin:keyLabelFlags="fontNormal" /> <!-- U+06CC: "ی" ARABIC LETTER FARSI YEH U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE U+064A: "ي" ARABIC LETTER YEH @@ -34,13 +36,16 @@ U+0649: "ى" ARABIC LETTER ALEF MAKSURA --> <Key latin:keyLabel="ی" - latin:moreKeys="ئ,ي,ﯨ|ى" /> + latin:moreKeys="ئ,ي,ﯨ|ى" + latin:keyLabelFlags="fontNormal" /> <!-- U+0628: "ب" ARABIC LETTER BEH --> <Key - latin:keyLabel="ب" /> + latin:keyLabel="ب" + latin:keyLabelFlags="fontNormal" /> <!-- U+0644: "ل" ARABIC LETTER LAM --> <Key - latin:keyLabel="ل" /> + latin:keyLabel="ل" + latin:keyLabelFlags="fontNormal" /> <!-- U+0627: "ا" ARABIC LETTER ALEF U+0621: "ء" ARABIC LETTER HAMZA U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE @@ -49,25 +54,31 @@ U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW --> <Key latin:keyLabel="ا" - latin:moreKeys="ء,آ,أ,ٱ,إ" /> + latin:moreKeys="ء,آ,أ,ٱ,إ" + latin:keyLabelFlags="fontNormal" /> <!-- U+062A: "ت" ARABIC LETTER TEH U+062B: "ﺙ" ARABIC LETTER THEH U+0629: "ة": ARABIC LETTER TEH MARBUTA --> <Key latin:keyLabel="ت" - latin:moreKeys="ث,ة" /> + latin:moreKeys="ث,ة" + latin:keyLabelFlags="fontNormal" /> <!-- U+0646: "ن" ARABIC LETTER NOON --> <Key - latin:keyLabel="ن" /> + latin:keyLabel="ن" + latin:keyLabelFlags="fontNormal" /> <!-- U+0645: "م" ARABIC LETTER MEEM --> <Key - latin:keyLabel="م" /> + latin:keyLabel="م" + latin:keyLabelFlags="fontNormal" /> <!-- U+06A9: "ک" ARABIC LETTER KEHEH U+0643: "ك" ARABIC LETTER KAF --> <Key latin:keyLabel="ک" - latin:moreKeys="ك" /> + latin:moreKeys="ك" + latin:keyLabelFlags="fontNormal" /> <!-- U+06AF: "گ" ARABIC LETTER GAF --> <Key - latin:keyLabel="گ" /> + latin:keyLabel="گ" + latin:keyLabelFlags="fontNormal" /> </merge> diff --git a/java/res/xml-sw600dp/rowkeys_farsi3.xml b/java/res/xml-sw600dp/rowkeys_farsi3.xml index 998ba72d6..3597618ce 100644 --- a/java/res/xml-sw600dp/rowkeys_farsi3.xml +++ b/java/res/xml-sw600dp/rowkeys_farsi3.xml @@ -23,34 +23,44 @@ > <!-- U+0638: "ظ" ARABIC LETTER ZAH --> <Key - latin:keyLabel="ظ" /> + latin:keyLabel="ظ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0637: "ط" ARABIC LETTER TAH --> <Key - latin:keyLabel="ط" /> + latin:keyLabel="ط" + latin:keyLabelFlags="fontNormal" /> <!-- U+0698: "ژ" ARABIC LETTER JEH --> <Key - latin:keyLabel="ژ" /> + latin:keyLabel="ژ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0632: "ز" ARABIC LETTER ZAIN --> <Key - latin:keyLabel="ز" /> + latin:keyLabel="ز" + latin:keyLabelFlags="fontNormal" /> <!-- U+0631: "ر" ARABIC LETTER REH --> <Key - latin:keyLabel="ر" /> + latin:keyLabel="ر" + latin:keyLabelFlags="fontNormal" /> <!-- U+0630: "ذ" ARABIC LETTER THAL --> <Key - latin:keyLabel="ذ" /> + latin:keyLabel="ذ" + latin:keyLabelFlags="fontNormal" /> <!-- U+062F: "د" ARABIC LETTER DAL --> <Key - latin:keyLabel="د" /> + latin:keyLabel="د" + latin:keyLabelFlags="fontNormal" /> <!-- U+067E: "پ" ARABIC LETTER PEH --> <Key - latin:keyLabel="پ" /> + latin:keyLabel="پ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0648: "و" ARABIC LETTER WAW U+0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE --> <Key latin:keyLabel="و" - latin:moreKeys="ؤ" /> + latin:moreKeys="ؤ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE --> <Key - latin:keyLabel="آ" /> + latin:keyLabel="آ" + latin:keyLabelFlags="fontNormal" /> </merge> diff --git a/java/res/xml-sw600dp/rowkeys_thai1.xml b/java/res/xml-sw600dp/rowkeys_thai1.xml deleted file mode 100644 index 6aec7c2c5..000000000 --- a/java/res/xml-sw600dp/rowkeys_thai1.xml +++ /dev/null @@ -1,97 +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="๑" /> - <!-- U+0E52: "๒" THAI DIGIT TWO --> - <Key - latin:keyLabel="๒" /> - <!-- U+0E53: "๓" THAI DIGIT THREE --> - <Key - latin:keyLabel="๓" /> - <!-- U+0E54: "๔" THAI DIGIT FOUR --> - <Key - latin:keyLabel="๔" /> - <!-- U+0E39: " ู" THAI CHARACTER SARA UU --> - <Key - latin:keyLabel="ู" /> - <!-- U+0E3F: "฿" THAI CURRENCY SYMBOL BAHT --> - <Key - latin:keyLabel="฿" /> - <!-- U+0E55: "๕" THAI DIGIT FIVE --> - <Key - latin:keyLabel="๕" /> - <!-- U+0E56: "๖" THAI DIGIT SIX --> - <Key - latin:keyLabel="๖" /> - <!-- U+0E57: "๗" THAI DIGIT SEVEN --> - <Key - latin:keyLabel="๗" /> - <!-- U+0E58: "๘" THAI DIGIT EIGHT --> - <Key - latin:keyLabel="๘" /> - <!-- U+0E59: "๙" THAI DIGIT NINE --> - <Key - latin:keyLabel="๙" /> - </case> - <default> - <!-- U+0E45: "ๅ" THAI CHARACTER LAKKHANGYAO --> - <Key - latin:keyLabel="ๅ" /> - <Key - latin:keyLabel="/" /> - <!-- U+0E20: "ภ" THAI CHARACTER PHO SAMPHAO --> - <Key - latin:keyLabel="ภ" /> - <!-- U+0E16: "ถ" THAI CHARACTER THO THUNG --> - <Key - latin:keyLabel="ถ" /> - <!-- U+0E38: " ุ" THAI CHARACTER SARA U --> - <Key - latin:keyLabel="ุ" /> - <!-- U+0E36: " ึ" THAI CHARACTER SARA UE --> - <Key - latin:keyLabel="ึ" /> - <!-- U+0E04: "ค" THAI CHARACTER KHO KHWAI --> - <Key - latin:keyLabel="ค" /> - <!-- U+0E15: "ต" THAI CHARACTER TO TAO --> - <Key - latin:keyLabel="ต" /> - <!-- U+0E08: "จ" THAI CHARACTER CHO CHAN --> - <Key - latin:keyLabel="จ" /> - <!-- U+0E02: "ข" THAI CHARACTER KHO KHAI --> - <Key - latin:keyLabel="ข" /> - <!-- U+0E0A: "ช" THAI CHARACTER CHO CHANG --> - <Key - latin:keyLabel="ช" /> - </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 edb759a89..000000000 --- a/java/res/xml-sw600dp/rowkeys_thai2.xml +++ /dev/null @@ -1,108 +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="๐" /> - <Key - latin:keyLabel=""" /> - <!-- U+0E0E: "ฎ" THAI CHARACTER DO CHADA --> - <Key - latin:keyLabel="ฎ" /> - <!-- U+0E11: "ฑ" THAI CHARACTER THO NANGMONTHO --> - <Key - latin:keyLabel="ฑ" /> - <!-- U+0E18: "ธ" THAI CHARACTER THO THONG --> - <Key - latin:keyLabel="ธ" /> - <!-- U+0E4D: " ํ" THAI CHARACTER THANTHAKHAT --> - <Key - latin:keyLabel="ํ" /> - <!-- U+0E4A: " ๊" THAI CHARACTER MAI TRI --> - <Key - latin:keyLabel="๊" /> - <!-- U+0E13: "ณ" THAI CHARACTER NO NEN --> - <Key - latin:keyLabel="ณ" /> - <!-- U+0E2F: "ฯ" THAI CHARACTER PAIYANNOI --> - <Key - latin:keyLabel="ฯ" /> - <!-- U+0E0D: "ญ" THAI CHARACTER YO YING --> - <Key - latin:keyLabel="ญ" /> - <!-- U+0E10: "ฐ" THAI CHARACTER THO THAN --> - <Key - latin:keyLabel="ฐ" /> - <Key - latin:keyLabel="," /> - <!-- U+0E05: "ฅ" THAI CHARACTER KHO KHON --> - <Key - latin:keyLabel="ฅ" /> - </case> - <default> - <!-- U+0E46: "ๆ" THAI CHARACTER MAIYAMOK --> - <Key - latin:keyLabel="ๆ" /> - <!-- U+0E44: "ไ" THAI CHARACTER SARA AI MAIMALAI --> - <Key - latin:keyLabel="ไ" /> - <!-- U+0E33: "ำ" THAI CHARACTER SARA AM --> - <Key - latin:keyLabel="ำ" /> - <!-- U+0E1E: "พ" THAI CHARACTER PHO PHAN --> - <Key - latin:keyLabel="พ" /> - <!-- U+0E30: "ะ" THAI CHARACTER SARA A --> - <Key - latin:keyLabel="ะ" /> - <!-- U+0E31: " ั" THAI CHARACTER MAI HAN-AKAT --> - <Key - latin:keyLabel="ั" /> - <!-- U+0E35: " ี" HAI CHARACTER SARA II --> - <Key - latin:keyLabel="ี" /> - <!-- U+0E23: "ร" THAI CHARACTER RO RUA --> - <Key - latin:keyLabel="ร" /> - <!-- U+0E19: "น" THAI CHARACTER NO NU --> - <Key - latin:keyLabel="น" /> - <!-- U+0E22: "ย" THAI CHARACTER YO YAK --> - <Key - latin:keyLabel="ย" /> - <!-- U+0E1A: "บ" THAI CHARACTER BO BAIMAI --> - <Key - latin:keyLabel="บ" /> - <!-- U+0E25: "ล" THAI CHARACTER LO LING --> - <Key - latin:keyLabel="ล" /> - <!-- U+0E03: "ฃ" THAI CHARACTER KHO KHUAT --> - <Key - latin:keyLabel="ฃ" /> - </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 7507dde86..000000000 --- a/java/res/xml-sw600dp/rowkeys_thai3.xml +++ /dev/null @@ -1,97 +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="ฤ" /> - <!-- U+0E06: "ฆ" THAI CHARACTER KHO RAKHANG --> - <Key - latin:keyLabel="ฆ" /> - <!-- U+0E0F: "ฏ" THAI CHARACTER TO PATAK --> - <Key - latin:keyLabel="ฏ" /> - <!-- U+0E42: "โ" THAI CHARACTER SARA O --> - <Key - latin:keyLabel="โ" /> - <!-- U+0E0C: "ฌ" THAI CHARACTER CHO CHOE --> - <Key - latin:keyLabel="ฌ" /> - <!-- U+0E47: " ็" THAI CHARACTER MAITAIKHU --> - <Key - latin:keyLabel="็" /> - <!-- U+0E4B: " ๋" THAI CHARACTER MAI CHATTAWA --> - <Key - latin:keyLabel="๋" /> - <!-- U+0E29: "ษ" THAI CHARACTER SO RUSI --> - <Key - latin:keyLabel="ษ" /> - <!-- U+0E28: "ศ" THAI CHARACTER SO SALA --> - <Key - latin:keyLabel="ศ" /> - <!-- U+0E0B: "ซ" THAI CHARACTER SO SO --> - <Key - latin:keyLabel="ซ" /> - <Key - latin:keyLabel="." /> - </case> - <default> - <!-- U+0E1F: "ฟ" THAI CHARACTER FO FAN --> - <Key - latin:keyLabel="ฟ" /> - <!-- U+0E2B: "ห" THAI CHARACTER HO HIP --> - <Key - latin:keyLabel="ห" /> - <!-- U+0E01: "ก" THAI CHARACTER KO KAI --> - <Key - latin:keyLabel="ก" /> - <!-- U+0E14: "ด" THAI CHARACTER DO DEK --> - <Key - latin:keyLabel="ด" /> - <!-- U+0E40: "เ" THAI CHARACTER SARA E --> - <Key - latin:keyLabel="เ" /> - <!-- U+0E49: " ้" THAI CHARACTER MAI THO --> - <Key - latin:keyLabel="้" /> - <!-- U+0E48: " ฺ" THAI CHARACTER MAI EK --> - <Key - latin:keyLabel="่" /> - <!-- U+0E32: "า" THAI CHARACTER SARA AA --> - <Key - latin:keyLabel="า" /> - <!-- U+0E2A: "ส" THAI CHARACTER SO SUA --> - <Key - latin:keyLabel="ส" /> - <!-- U+0E27: "ว" THAI CHARACTER WO WAEN --> - <Key - latin:keyLabel="ว" /> - <!-- U+0E07: "ง" THAI CHARACTER NGO NGU --> - <Key - latin:keyLabel="ง" /> - </default> - </switch> -</merge> diff --git a/java/res/xml-sw600dp/rowkeys_thai4.xml b/java/res/xml-sw600dp/rowkeys_thai4.xml deleted file mode 100644 index 64549bdce..000000000 --- a/java/res/xml-sw600dp/rowkeys_thai4.xml +++ /dev/null @@ -1,89 +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" - > - <Key - latin:keyLabel="(" /> - <Key - latin:keyLabel=")" /> - <!-- U+0E09: "ฉ" THAI CHARACTER CHO CHING --> - <Key - latin:keyLabel="ฉ" /> - <!-- U+0E2E: "ฮ" THAI CHARACTER HO NOKHUK --> - <Key - latin:keyLabel="ฮ" /> - <!-- U+0E3A: " ฺ" THAI CHARACTER PHINTHU --> - <Key - latin:keyLabel="ฺ" /> - <!-- U+0E4C: " ์" THAI CHARACTER THANTHAKHAT --> - <Key - latin:keyLabel="์" /> - <Key - latin:keyLabel="\?" /> - <!-- U+0E12: "ฒ" THAI CHARACTER THO PHUTHAO --> - <Key - latin:keyLabel="ฒ" /> - <!-- U+0E2C: "ฬ" THAI CHARACTER LO CHULA --> - <Key - latin:keyLabel="ฬ" /> - <!-- U+0E26: "ฦ" THAI CHARACTER LU --> - <Key - latin:keyLabel="ฦ" /> - </case> - <default> - <!-- U+0E1C: "ผ" THAI CHARACTER PHO PHUNG --> - <Key - latin:keyLabel="ผ" /> - <!-- U+0E1B: "ป" THAI CHARACTER PO PLA --> - <Key - latin:keyLabel="ป" /> - <!-- U+0E41: "แ" THAI CHARACTER SARA AE --> - <Key - latin:keyLabel="แ" /> - <!-- U+0E2D: "อ" THAI CHARACTER O ANG --> - <Key - latin:keyLabel="อ" /> - <!-- U+0E34: " ิ" THAI CHARACTER SARA I --> - <Key - latin:keyLabel="ิ" /> - <!-- U+0E37: " ื" THAI CHARACTER SARA UEE --> - <Key - latin:keyLabel="ื" /> - <!-- U+0E17: "ท" THAI CHARACTER THO THAHAN --> - <Key - latin:keyLabel="ท" /> - <!-- U+0E21: "ม" THAI CHARACTER MO MA --> - <Key - latin:keyLabel="ม" /> - <!-- U+0E43: "ใ" THAI CHARACTER SARA AI MAIMUAN --> - <Key - latin:keyLabel="ใ" /> - <!-- U+0E1D: "ฝ" THAI CHARACTER FO FA --> - <Key - latin:keyLabel="ฝ" /> - </default> - </switch> -</merge> diff --git a/java/res/xml-sw600dp/rows_thai.xml b/java/res/xml-sw600dp/rows_thai.xml index c1fe55b39..bc89640ac 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" /> |