diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/xml-sw600dp/rowkeys_arabic1.xml | 71 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/rowkeys_arabic2.xml | 83 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/rowkeys_arabic3.xml | 59 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/rowkeys_bulgarian1.xml | 59 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/rows_arabic.xml | 147 | ||||
| -rw-r--r-- | java/res/xml-sw600dp/rows_bulgarian.xml | 98 | ||||
| -rw-r--r-- | java/res/xml-sw768dp/rows_arabic.xml | 146 | ||||
| -rw-r--r-- | java/res/xml-sw768dp/rows_bulgarian.xml | 98 | ||||
| -rw-r--r-- | java/res/xml/rowkeys_arabic1.xml | 98 | ||||
| -rw-r--r-- | java/res/xml/rowkeys_arabic2.xml | 83 | ||||
| -rw-r--r-- | java/res/xml/rowkeys_arabic3.xml | 52 | ||||
| -rw-r--r-- | java/res/xml/rowkeys_bulgarian1.xml | 79 | ||||
| -rw-r--r-- | java/res/xml/rowkeys_bulgarian2.xml | 57 | ||||
| -rw-r--r-- | java/res/xml/rowkeys_bulgarian3.xml | 48 | ||||
| -rw-r--r-- | java/res/xml/rows_arabic.xml | 168 | ||||
| -rw-r--r-- | java/res/xml/rows_bulgarian.xml | 120 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 24 |
17 files changed, 736 insertions, 754 deletions
diff --git a/java/res/xml-sw600dp/rowkeys_arabic1.xml b/java/res/xml-sw600dp/rowkeys_arabic1.xml new file mode 100644 index 000000000..44fdc676d --- /dev/null +++ b/java/res/xml-sw600dp/rowkeys_arabic1.xml @@ -0,0 +1,71 @@ +<?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" +> + <!-- U+0636: "ض" ARABIC LETTER DAD --> + <Key + latin:keyLabel="ض" /> + <!-- U+0635: "ص" ARABIC LETTER SAD --> + <Key + latin:keyLabel="ص" /> + <!-- U+062B: "ث" ARABIC LETTER THEH --> + <Key + latin:keyLabel="ث" /> + <!-- 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="ڨ" /> + <!-- U+0641: "ف" ARABIC LETTER FEH + U+06A4: "ڤ" ARABIC LETTER VEH + U+06A2: "ڢ" ARABIC LETTER FEH WITH DOT MOVED BELOW + U+06A5: "ڥ" ARABIC LETTER FEH WITH THREE DOTS BELOW --> + <!-- TODO: DroidSansArabic lacks the glyph of U+06A2 ARABIC LETTER FEH WITH DOT MOVED BELOW --> + <!-- TODO: DroidSansArabic lacks the glyph of U+06A5 ARABIC LETTER FEH WITH THREE DOTS BELOW --> + <Key + latin:keyLabel="ف" + latin:moreKeys="ڤ,ڢ,ڥ" /> + <!-- U+063A: "غ" ARABIC LETTER GHAIN --> + <Key + latin:keyLabel="غ" /> + <!-- U+0639: "ع" ARABIC LETTER AIN --> + <Key + latin:keyLabel="ع" /> + <!-- 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="ﻫ|ه‍" /> + <!-- U+062E: "خ" ARABIC LETTER KHAH --> + <Key + latin:keyLabel="خ" /> + <!-- U+062D: "ح" ARABIC LETTER HAH --> + <Key + latin:keyLabel="ح" /> + <!-- U+062C: "ج" ARABIC LETTER JEEM + U+0686: "چ" ARABIC LETTER TCHEH --> + <Key + latin:keyLabel="ج" + latin:moreKeys="چ" /> +</merge> diff --git a/java/res/xml-sw600dp/rowkeys_arabic2.xml b/java/res/xml-sw600dp/rowkeys_arabic2.xml new file mode 100644 index 000000000..3eba2fbf3 --- /dev/null +++ b/java/res/xml-sw600dp/rowkeys_arabic2.xml @@ -0,0 +1,83 @@ +<?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" +> + <!-- U+0634: "ش" ARABIC LETTER SHEEN + U+069C: "ڜ" ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE --> + <!-- TODO: DroidSansArabic lacks the glyph of U+069C ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE --> + <Key + latin:keyLabel="ش" + latin:moreKeys="ڜ" /> + <!-- U+0633: "س" ARABIC LETTER SEEN --> + <Key + latin:keyLabel="س" /> + <!-- U+064A: "ي" ARABIC LETTER YEH + U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE + U+0649: "ى" ARABIC LETTER ALEF MAKSURA --> + <Key + latin:keyLabel="ي" + latin:moreKeys="ئ,ى" /> + <!-- U+0628: "ب" ARABIC LETTER BEH + U+067E: "پ" ARABIC LETTER PEH --> + <Key + latin:keyLabel="ب" + latin:moreKeys="پ" /> + <!-- U+0644: "ل" ARABIC LETTER LAM + U+FEFB: "ﻻ" ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM + U+0627: "ا" ARABIC LETTER ALEF + U+FEF7: "ﻷ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM + U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE + U+FEF9: "ﻹ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM + U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW + U+FEF5: "ﻵ" ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM + U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE --> + <Key + latin:keyLabel="ل" + latin:moreKeys="ﻻ|لا,ﻷ|لأ,ﻹ|لإ,ﻵ|لآ" /> + <!-- U+0627: "ا" ARABIC LETTER ALEF + U+0621: "ء" ARABIC LETTER HAMZA + U+0671: "ٱ" ARABIC LETTER ALEF WASLA + U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE + U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW + U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE --> + <Key + latin:keyLabel="ا" + latin:moreKeys="ء,ٱ,أ,إ,آ" /> + <!-- U+062A: "ت" ARABIC LETTER TEH --> + <Key + latin:keyLabel="ت" /> + <!-- U+0646: "ن" ARABIC LETTER NOON --> + <Key + latin:keyLabel="ن" /> + <!-- U+0645: "م" ARABIC LETTER MEEM --> + <Key + latin:keyLabel="م" /> + <!-- U+0643: "ك" ARABIC LETTER KAF + U+06AF: "گ" ARABIC LETTER GAF + U+06A9: "ک" ARABIC LETTER KEHEH --> + <Key + latin:keyLabel="ك" + latin:moreKeys="گ,ک" /> + <!-- U+0637: "ط" ARABIC LETTER TAH --> + <Key + latin:keyLabel="ط" /> +</merge> diff --git a/java/res/xml-sw600dp/rowkeys_arabic3.xml b/java/res/xml-sw600dp/rowkeys_arabic3.xml new file mode 100644 index 000000000..911550f4a --- /dev/null +++ b/java/res/xml-sw600dp/rowkeys_arabic3.xml @@ -0,0 +1,59 @@ +<?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" +> + <!-- U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE --> + <Key + latin:keyLabel="ئ" /> + <!-- U+0621: "ء" ARABIC LETTER HAMZA --> + <Key + latin:keyLabel="ء" /> + <!-- U+0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE --> + <Key + latin:keyLabel="ؤ" /> + <!-- U+0631: "ر" ARABIC LETTER REH --> + <Key + latin:keyLabel="ر" /> + <!-- U+0630: "ذ" ARABIC LETTER THAL --> + <Key + latin:keyLabel="ذ" /> + <!-- U+0649: "ى" ARABIC LETTER ALEF MAKSURA --> + <Key + latin:keyLabel="ى" /> + <!-- U+0629: "ة" ARABIC LETTER TEH MARBUTA --> + <Key + latin:keyLabel="ة" /> + <!-- U+0648: "و" ARABIC LETTER WAW --> + <Key + latin:keyLabel="و" /> + <!-- U+0632: "ز" ARABIC LETTER ZAIN + U+0698: "ژ" ARABIC LETTER JEH --> + <Key + latin:keyLabel="ز" + latin:moreKeys="ژ" /> + <!-- U+0638: "ظ" ARABIC LETTER ZAH --> + <Key + latin:keyLabel="ظ" /> + <!-- U+062F: "د" ARABIC LETTER DAL --> + <Key + latin:keyLabel="د" /> +</merge> diff --git a/java/res/xml-sw600dp/rowkeys_bulgarian1.xml b/java/res/xml-sw600dp/rowkeys_bulgarian1.xml new file mode 100644 index 000000000..3e1b2e5cc --- /dev/null +++ b/java/res/xml-sw600dp/rowkeys_bulgarian1.xml @@ -0,0 +1,59 @@ +<?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" +> + <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE --> + <Key + latin:keyLabel="ч" /> + <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA --> + <Key + latin:keyLabel="ш" /> + <!-- U+0435: "е" CYRILLIC SMALL LETTER IE --> + <Key + latin:keyLabel="е" /> + <!-- U+0440: "р" CYRILLIC SMALL LETTER ER --> + <Key + latin:keyLabel="р" /> + <!-- U+0442: "т" CYRILLIC SMALL LETTER TE --> + <Key + latin:keyLabel="т" /> + <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN --> + <Key + latin:keyLabel="ъ" /> + <!-- U+0443: "у" CYRILLIC SMALL LETTER U --> + <Key + latin:keyLabel="у" /> + <!-- U+0438: "и" CYRILLIC SMALL LETTER I + U+045D: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE --> + <Key + latin:keyLabel="и" + latin:moreKeys="ѝ" /> + <!-- U+043E: "о" CYRILLIC SMALL LETTER O --> + <Key + latin:keyLabel="о" /> + <!-- U+043F: "п" CYRILLIC SMALL LETTER PE --> + <Key + latin:keyLabel="п" /> + <!-- U+044F: "я" CYRILLIC SMALL LETTER YA --> + <Key + latin:keyLabel="я" /> +</merge> diff --git a/java/res/xml-sw600dp/rows_arabic.xml b/java/res/xml-sw600dp/rows_arabic.xml index 60ad45e7f..9aecaa648 100644 --- a/java/res/xml-sw600dp/rows_arabic.xml +++ b/java/res/xml-sw600dp/rows_arabic.xml @@ -26,53 +26,8 @@ <Row latin:keyWidth="8.0%p" > - <!-- U+0636: "ض" ARABIC LETTER DAD --> - <Key - latin:keyLabel="ض" /> - <!-- U+0635: "ص" ARABIC LETTER SAD --> - <Key - latin:keyLabel="ص" /> - <!-- U+062B: "ث" ARABIC LETTER THEH --> - <Key - latin:keyLabel="ث" /> - <!-- 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="ڨ" /> - <!-- U+0641: "ف" ARABIC LETTER FEH - U+06A4: "ڤ" ARABIC LETTER VEH - U+06A2: "ڢ" ARABIC LETTER FEH WITH DOT MOVED BELOW - U+06A5: "ڥ" ARABIC LETTER FEH WITH THREE DOTS BELOW --> - <!-- TODO: DroidSansArabic lacks the glyph of U+06A2 ARABIC LETTER FEH WITH DOT MOVED BELOW --> - <!-- TODO: DroidSansArabic lacks the glyph of U+06A5 ARABIC LETTER FEH WITH THREE DOTS BELOW --> - <Key - latin:keyLabel="ف" - latin:moreKeys="ڤ,ڢ,ڥ" /> - <!-- U+063A: "غ" ARABIC LETTER GHAIN --> - <Key - latin:keyLabel="غ" /> - <!-- U+0639: "ع" ARABIC LETTER AIN --> - <Key - latin:keyLabel="ع" /> - <!-- 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="ﻫ|ه‍" /> - <!-- U+062E: "خ" ARABIC LETTER KHAH --> - <Key - latin:keyLabel="خ" /> - <!-- U+062D: "ح" ARABIC LETTER HAH --> - <Key - latin:keyLabel="ح" /> - <!-- U+062C: "ج" ARABIC LETTER JEEM - U+0686: "چ" ARABIC LETTER TCHEH --> - <Key - latin:keyLabel="ج" - latin:moreKeys="چ" /> + <include + latin:keyboardLayout="@xml/rowkeys_arabic1" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyXPos="-10.0%p" @@ -81,66 +36,9 @@ <Row latin:keyWidth="8.0%p" > - <!-- U+0634: "ش" ARABIC LETTER SHEEN - U+069C: "ڜ" ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE --> - <!-- TODO: DroidSansArabic lacks the glyph of U+069C ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE --> - <Key - latin:keyLabel="ش" - latin:moreKeys="ڜ" + <include + latin:keyboardLayout="@xml/rowkeys_arabic2" latin:keyXPos="3.0%p" /> - <!-- U+0633: "س" ARABIC LETTER SEEN --> - <Key - latin:keyLabel="س" /> - <!-- U+064A: "ي" ARABIC LETTER YEH - U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE - U+0649: "ى" ARABIC LETTER ALEF MAKSURA --> - <Key - latin:keyLabel="ي" - latin:moreKeys="ئ,ى" /> - <!-- U+0628: "ب" ARABIC LETTER BEH - U+067E: "پ" ARABIC LETTER PEH --> - <Key - latin:keyLabel="ب" - latin:moreKeys="پ" /> - <!-- U+0644: "ل" ARABIC LETTER LAM - U+FEFB: "ﻻ" ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM - U+0627: "ا" ARABIC LETTER ALEF - U+FEF7: "ﻷ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM - U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE - U+FEF9: "ﻹ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM - U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW - U+FEF5: "ﻵ" ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM - U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE --> - <Key - latin:keyLabel="ل" - latin:moreKeys="ﻻ|لا,ﻷ|لأ,ﻹ|لإ,ﻵ|لآ" /> - <!-- U+0627: "ا" ARABIC LETTER ALEF - U+0621: "ء" ARABIC LETTER HAMZA - U+0671: "ٱ" ARABIC LETTER ALEF WASLA - U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE - U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW - U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE --> - <Key - latin:keyLabel="ا" - latin:moreKeys="ء,ٱ,أ,إ,آ" /> - <!-- U+062A: "ت" ARABIC LETTER TEH --> - <Key - latin:keyLabel="ت" /> - <!-- U+0646: "ن" ARABIC LETTER NOON --> - <Key - latin:keyLabel="ن" /> - <!-- U+0645: "م" ARABIC LETTER MEEM --> - <Key - latin:keyLabel="م" /> - <!-- U+0643: "ك" ARABIC LETTER KAF - U+06AF: "گ" ARABIC LETTER GAF - U+06A9: "ک" ARABIC LETTER KEHEH --> - <Key - latin:keyLabel="ك" - latin:moreKeys="گ,ک" /> - <!-- U+0637: "ط" ARABIC LETTER TAH --> - <Key - latin:keyLabel="ط" /> <Key latin:keyStyle="enterKeyStyle" latin:keyXPos="-14.6%p" @@ -151,41 +49,8 @@ > <include latin:keyboardLayout="@xml/key_smiley" /> - <!-- U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE --> - <Key - latin:keyLabel="ئ" /> - <!-- U+0621: "ء" ARABIC LETTER HAMZA --> - <Key - latin:keyLabel="ء" /> - <!-- U+0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE --> - <Key - latin:keyLabel="ؤ" /> - <!-- U+0631: "ر" ARABIC LETTER REH --> - <Key - latin:keyLabel="ر" /> - <!-- U+0630: "ذ" ARABIC LETTER THAL --> - <Key - latin:keyLabel="ذ" /> - <!-- U+0649: "ى" ARABIC LETTER ALEF MAKSURA --> - <Key - latin:keyLabel="ى" /> - <!-- U+0629: "ة" ARABIC LETTER TEH MARBUTA --> - <Key - latin:keyLabel="ة" /> - <!-- U+0648: "و" ARABIC LETTER WAW --> - <Key - latin:keyLabel="و" /> - <!-- U+0632: "ز" ARABIC LETTER ZAIN - U+0698: "ژ" ARABIC LETTER JEH --> - <Key - latin:keyLabel="ز" - latin:moreKeys="ژ" /> - <!-- U+0638: "ظ" ARABIC LETTER ZAH --> - <Key - latin:keyLabel="ظ" /> - <!-- U+062F: "د" ARABIC LETTER DAL --> - <Key - latin:keyLabel="د" /> + <include + latin:keyboardLayout="@xml/rowkeys_arabic3" /> </Row> <include latin:keyboardLayout="@xml/row_qwerty4" /> diff --git a/java/res/xml-sw600dp/rows_bulgarian.xml b/java/res/xml-sw600dp/rows_bulgarian.xml index 87a273cef..054b4500e 100644 --- a/java/res/xml-sw600dp/rows_bulgarian.xml +++ b/java/res/xml-sw600dp/rows_bulgarian.xml @@ -26,41 +26,8 @@ <Row latin:keyWidth="7.692%p" > - <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE --> - <Key - latin:keyLabel="ч" /> - <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA --> - <Key - latin:keyLabel="ш" /> - <!-- U+0435: "е" CYRILLIC SMALL LETTER IE --> - <Key - latin:keyLabel="е" /> - <!-- U+0440: "р" CYRILLIC SMALL LETTER ER --> - <Key - latin:keyLabel="р" /> - <!-- U+0442: "т" CYRILLIC SMALL LETTER TE --> - <Key - latin:keyLabel="т" /> - <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN --> - <Key - latin:keyLabel="ъ" /> - <!-- U+0443: "у" CYRILLIC SMALL LETTER U --> - <Key - latin:keyLabel="у" /> - <!-- U+0438: "и" CYRILLIC SMALL LETTER I - U+045D: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE --> - <Key - latin:keyLabel="и" - latin:moreKeys="ѝ" /> - <!-- U+043E: "о" CYRILLIC SMALL LETTER O --> - <Key - latin:keyLabel="о" /> - <!-- U+043F: "п" CYRILLIC SMALL LETTER PE --> - <Key - latin:keyLabel="п" /> - <!-- U+044F: "я" CYRILLIC SMALL LETTER YA --> - <Key - latin:keyLabel="я" /> + <include + latin:keyboardLayout="@xml/rowkeys_bulgarian1" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillBoth" /> @@ -68,40 +35,9 @@ <Row latin:keyWidth="7.692%p" > - <!-- U+0430: "а" CYRILLIC SMALL LETTER A --> - <Key - latin:keyLabel="а" + <include + latin:keyboardLayout="@xml/rowkeys_bulgarian2" latin:keyXPos="4.000%p" /> - <!-- U+0441: "с" CYRILLIC SMALL LETTER ES --> - <Key - latin:keyLabel="с" /> - <!-- U+0434: "д" CYRILLIC SMALL LETTER DE --> - <Key - latin:keyLabel="д" /> - <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF --> - <Key - latin:keyLabel="ф" /> - <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE --> - <Key - latin:keyLabel="г" /> - <!-- U+0445: "х" CYRILLIC SMALL LETTER HA --> - <Key - latin:keyLabel="х" /> - <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I --> - <Key - latin:keyLabel="й" /> - <!-- U+043A: "к" CYRILLIC SMALL LETTER KA --> - <Key - latin:keyLabel="к" /> - <!-- U+043B: "л" CYRILLIC SMALL LETTER EL --> - <Key - latin:keyLabel="л" /> - <!-- U+0449: "щ" CYRILLIC SMALL LETTER SHCHA --> - <Key - latin:keyLabel="щ" /> - <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN --> - <Key - latin:keyLabel="ь" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> @@ -112,30 +48,8 @@ <Key latin:keyStyle="shiftKeyStyle" latin:keyWidth="10.000%p" /> - <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE --> - <Key - latin:keyLabel="з" /> - <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE --> - <Key - latin:keyLabel="ж" /> - <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE --> - <Key - latin:keyLabel="ц" /> - <!-- U+0432: "в" CYRILLIC SMALL LETTER VE --> - <Key - latin:keyLabel="в" /> - <!-- U+0431: "б" CYRILLIC SMALL LETTER BE --> - <Key - latin:keyLabel="б" /> - <!-- U+043D: "н" CYRILLIC SMALL LETTER EN --> - <Key - latin:keyLabel="н" /> - <!-- U+043C: "м" CYRILLIC SMALL LETTER EM --> - <Key - latin:keyLabel="м" /> - <!-- U+044E: "ю" CYRILLIC SMALL LETTER YU --> - <Key - latin:keyLabel="ю" /> + <include + latin:keyboardLayout="@xml/rowkeys_bulgarian3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> <include diff --git a/java/res/xml-sw768dp/rows_arabic.xml b/java/res/xml-sw768dp/rows_arabic.xml index ac6e45922..d5f287e2f 100644 --- a/java/res/xml-sw768dp/rows_arabic.xml +++ b/java/res/xml-sw768dp/rows_arabic.xml @@ -30,53 +30,8 @@ latin:keyStyle="tabKeyStyle" latin:keyLabelFlags="alignLeft" latin:keyWidth="7.500%p" /> - <!-- U+0636: "ض" ARABIC LETTER DAD --> - <Key - latin:keyLabel="ض" /> - <!-- U+0635: "ص" ARABIC LETTER SAD --> - <Key - latin:keyLabel="ص" /> - <!-- U+062B: "ث" ARABIC LETTER THEH --> - <Key - latin:keyLabel="ث" /> - <!-- 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="ڨ" /> - <!-- U+0641: "ف" ARABIC LETTER FEH - U+06A4: "ڤ" ARABIC LETTER VEH - U+06A2: "ڢ" ARABIC LETTER FEH WITH DOT MOVED BELOW - U+06A5: "ڥ" ARABIC LETTER FEH WITH THREE DOTS BELOW --> - <!-- TODO: DroidSansArabic lacks the glyph of U+06A2 ARABIC LETTER FEH WITH DOT MOVED BELOW --> - <!-- TODO: DroidSansArabic lacks the glyph of U+06A5 ARABIC LETTER FEH WITH THREE DOTS BELOW --> - <Key - latin:keyLabel="ف" - latin:moreKeys="ڤ,ڢ,ڥ" /> - <!-- U+063A: "غ" ARABIC LETTER GHAIN --> - <Key - latin:keyLabel="غ" /> - <!-- U+0639: "ع" ARABIC LETTER AIN --> - <Key - latin:keyLabel="ع" /> - <!-- 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="ﻫ|ه‍" /> - <!-- U+062E: "خ" ARABIC LETTER KHAH --> - <Key - latin:keyLabel="خ" /> - <!-- U+062D: "ح" ARABIC LETTER HAH --> - <Key - latin:keyLabel="ح" /> - <!-- U+062C: "ج" ARABIC LETTER JEEM - U+0686: "چ" ARABIC LETTER TCHEH --> - <Key - latin:keyLabel="ج" - latin:moreKeys="چ" /> + <include + latin:keyboardLayout="@xml/rowkeys_arabic1" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyXPos="-11.500%p" @@ -89,64 +44,8 @@ latin:keyStyle="toSymbolKeyStyle" latin:keyLabelFlags="alignLeft" latin:keyWidth="9.375%p" /> - <!-- U+0634: "ش" ARABIC LETTER SHEEN - U+069C: "ڜ" ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE --> - <!-- TODO: DroidSansArabic lacks the glyph of U+069C ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE --> - <Key - latin:keyLabel="ش" - latin:moreKeys="ڜ" /> - <!-- U+0633: "س" ARABIC LETTER SEEN --> - <Key - latin:keyLabel="س" /> - <!-- U+064A: "ي" ARABIC LETTER YEH - U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE - U+0649: "ى" ARABIC LETTER ALEF MAKSURA --> - <Key - latin:keyLabel="ي" - latin:moreKeys="ئ,ى" /> - <!-- U+0628: "ب" ARABIC LETTER BEH - U+067E: "پ" ARABIC LETTER PEH --> - <Key - latin:keyLabel="ب" - latin:moreKeys="پ" /> - <!-- U+0644: "ل" ARABIC LETTER LAM - U+FEFB: "ﻻ" ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM - U+0627: "ا" ARABIC LETTER ALEF - U+FEF7: "ﻷ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM - U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE - U+FEF9: "ﻹ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM - U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW - U+FEF5: "ﻵ" ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM - U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE --> - <Key - latin:keyLabel="ل" - latin:moreKeys="ﻻ|لا,ﻷ|لأ,ﻹ|لإ,ﻵ|لآ" /> - <!-- U+0627: "ا" ARABIC LETTER ALEF - U+0621: "ء" ARABIC LETTER HAMZA - U+0671: "ٱ" ARABIC LETTER ALEF WASLA - U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE - U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW - U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE --> - <Key - latin:keyLabel="ا" - latin:moreKeys="ء,ٱ,أ,إ,آ" /> - <!-- U+062A: "ت" ARABIC LETTER TEH --> - <Key - latin:keyLabel="ت" /> - <!-- U+0646: "ن" ARABIC LETTER NOON --> - <Key - latin:keyLabel="ن" /> - <!-- U+0645: "م" ARABIC LETTER MEEM --> - <Key - latin:keyLabel="م" /> - <!-- U+0643: "ك" ARABIC LETTER KAF - U+06AF: "گ" ARABIC LETTER GAF --> - <Key - latin:keyLabel="ك" - latin:moreKeys="گ" /> - <!-- U+0637: "ط" ARABIC LETTER TAH --> - <Key - latin:keyLabel="ط" /> + <include + latin:keyboardLayout="@xml/rowkeys_arabic2" /> <Key latin:keyStyle="enterKeyStyle" latin:keyXPos="-9.375%p" @@ -155,42 +54,9 @@ <Row latin:keyWidth="7.375%p" > - <!-- U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE --> - <Key - latin:keyLabel="ئ" + <include + latin:keyboardLayout="@xml/rowkeys_arabic3" latin:keyXPos="12.750%p" /> - <!-- U+0621: "ء" ARABIC LETTER HAMZA --> - <Key - latin:keyLabel="ء" /> - <!-- U+0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE --> - <Key - latin:keyLabel="ؤ" /> - <!-- U+0631: "ر" ARABIC LETTER REH --> - <Key - latin:keyLabel="ر" /> - <!-- U+0630: "ذ" ARABIC LETTER THAL --> - <Key - latin:keyLabel="ذ" /> - <!-- U+0649: "ى" ARABIC LETTER ALEF MAKSURA --> - <Key - latin:keyLabel="ى" /> - <!-- U+0629: "ة" ARABIC LETTER TEH MARBUTA --> - <Key - latin:keyLabel="ة" /> - <!-- U+0648: "و" ARABIC LETTER WAW --> - <Key - latin:keyLabel="و" /> - <!-- U+0632: "ز" ARABIC LETTER ZAIN - U+0698: "ژ" ARABIC LETTER JEH --> - <Key - latin:keyLabel="ز" - latin:moreKeys="ژ" /> - <!-- U+0638: "ظ" ARABIC LETTER ZAH --> - <Key - latin:keyLabel="ظ" /> - <!-- U+062F: "د" ARABIC LETTER DAL --> - <Key - latin:keyLabel="د" /> </Row> <include latin:keyboardLayout="@xml/row_qwerty4" /> diff --git a/java/res/xml-sw768dp/rows_bulgarian.xml b/java/res/xml-sw768dp/rows_bulgarian.xml index 0204dae97..7fac3edbd 100644 --- a/java/res/xml-sw768dp/rows_bulgarian.xml +++ b/java/res/xml-sw768dp/rows_bulgarian.xml @@ -29,41 +29,8 @@ <Key latin:keyStyle="tabKeyStyle" latin:keyLabelFlags="alignLeft" /> - <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE --> - <Key - latin:keyLabel="ч" /> - <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA --> - <Key - latin:keyLabel="ш" /> - <!-- U+0435: "е" CYRILLIC SMALL LETTER IE --> - <Key - latin:keyLabel="е" /> - <!-- U+0440: "р" CYRILLIC SMALL LETTER ER --> - <Key - latin:keyLabel="р" /> - <!-- U+0442: "т" CYRILLIC SMALL LETTER TE --> - <Key - latin:keyLabel="т" /> - <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN --> - <Key - latin:keyLabel="ъ" /> - <!-- U+0443: "у" CYRILLIC SMALL LETTER U --> - <Key - latin:keyLabel="у" /> - <!-- U+0438: "и" CYRILLIC SMALL LETTER I - U+045D: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE --> - <Key - latin:keyLabel="и" - latin:moreKeys="ѝ" /> - <!-- U+043E: "о" CYRILLIC SMALL LETTER O --> - <Key - latin:keyLabel="о" /> - <!-- U+043F: "п" CYRILLIC SMALL LETTER PE --> - <Key - latin:keyLabel="п" /> - <!-- U+044F: "я" CYRILLIC SMALL LETTER YA --> - <Key - latin:keyLabel="я" /> + <include + latin:keyboardLayout="@xml/rowkeys_bulgarian1" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillBoth" /> @@ -75,39 +42,8 @@ latin:keyStyle="toSymbolKeyStyle" latin:keyLabelFlags="alignLeft" latin:keyWidth="9.375%p" /> - <!-- U+0430: "а" CYRILLIC SMALL LETTER A --> - <Key - latin:keyLabel="а" /> - <!-- U+0441: "с" CYRILLIC SMALL LETTER ES --> - <Key - latin:keyLabel="с" /> - <!-- U+0434: "д" CYRILLIC SMALL LETTER DE --> - <Key - latin:keyLabel="д" /> - <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF --> - <Key - latin:keyLabel="ф" /> - <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE --> - <Key - latin:keyLabel="г" /> - <!-- U+0445: "х" CYRILLIC SMALL LETTER HA --> - <Key - latin:keyLabel="х" /> - <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I --> - <Key - latin:keyLabel="й" /> - <!-- U+043A: "к" CYRILLIC SMALL LETTER KA --> - <Key - latin:keyLabel="к" /> - <!-- U+043B: "л" CYRILLIC SMALL LETTER EL --> - <Key - latin:keyLabel="л" /> - <!-- U+0449: "щ" CYRILLIC SMALL LETTER SHCHA --> - <Key - latin:keyLabel="щ" /> - <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN --> - <Key - latin:keyLabel="ь" /> + <include + latin:keyboardLayout="@xml/rowkeys_bulgarian2" /> <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillBoth" /> @@ -118,30 +54,8 @@ <Key latin:keyStyle="shiftKeyStyle" latin:keyWidth="14.375%p" /> - <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE --> - <Key - latin:keyLabel="з" /> - <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE --> - <Key - latin:keyLabel="ж" /> - <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE --> - <Key - latin:keyLabel="ц" /> - <!-- U+0432: "в" CYRILLIC SMALL LETTER VE --> - <Key - latin:keyLabel="в" /> - <!-- U+0431: "б" CYRILLIC SMALL LETTER BE --> - <Key - latin:keyLabel="б" /> - <!-- U+043D: "н" CYRILLIC SMALL LETTER EN --> - <Key - latin:keyLabel="н" /> - <!-- U+043C: "м" CYRILLIC SMALL LETTER EM --> - <Key - latin:keyLabel="м" /> - <!-- U+044E: "ю" CYRILLIC SMALL LETTER YU --> - <Key - latin:keyLabel="ю" /> + <include + latin:keyboardLayout="@xml/rowkeys_bulgarian3" /> <include latin:keyboardLayout="@xml/keys_comma_period" /> <Key diff --git a/java/res/xml/rowkeys_arabic1.xml b/java/res/xml/rowkeys_arabic1.xml new file mode 100644 index 000000000..b1bf790e4 --- /dev/null +++ b/java/res/xml/rowkeys_arabic1.xml @@ -0,0 +1,98 @@ +<?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" +> + <!-- U+0636: "ض" ARABIC LETTER DAD + U+0661: "١" ARABIC-INDIC DIGIT ONE --> + <Key + latin:keyLabel="ض" + latin:keyHintLabel="1" + latin:additionalMoreKeys="1,١" /> + <!-- U+0635: "ص" ARABIC LETTER SAD + U+0662: "٢" ARABIC-INDIC DIGIT TWO --> + <Key + latin:keyLabel="ص" + latin:keyHintLabel="2" + latin:additionalMoreKeys="2,٢" /> + <!-- U+0642: "ق" ARABIC LETTER QAF + U+06A8: "ڨ" ARABIC LETTER QAF WITH THREE DOTS ABOVE + U+0663: "٣" ARABIC-INDIC DIGIT THREE --> + <!-- TODO: DroidSansArabic lacks the glyph of U+06A8 ARABIC LETTER QAF WITH THREE DOTS ABOVE --> + <Key + latin:keyLabel="ق" + latin:keyHintLabel="3" + latin:additionalMoreKeys="3,٣" + latin:moreKeys="ڨ" /> + <!-- U+0641: "ف" ARABIC LETTER FEH + U+06A4: "ڤ" ARABIC LETTER VEH + U+06A2: "ڢ" ARABIC LETTER FEH WITH DOT MOVED BELOW + U+06A5: "ڥ" ARABIC LETTER FEH WITH THREE DOTS BELOW + U+0664: "٤" ARABIC-INDIC DIGIT FOUR --> + <!-- TODO: DroidSansArabic lacks the glyph of U+06A2 ARABIC LETTER FEH WITH DOT MOVED BELOW --> + <!-- TODO: DroidSansArabic lacks the glyph of U+06A5 ARABIC LETTER FEH WITH THREE DOTS BELOW --> + <Key + latin:keyLabel="ف" + latin:keyHintLabel="4" + latin:additionalMoreKeys="4,٤" + latin:moreKeys="ڤ,ڢ,ڥ" /> + <!-- U+063A: "غ" ARABIC LETTER GHAIN + U+0665: "٥" ARABIC-INDIC DIGIT FIVE --> + <Key + latin:keyLabel="غ" + latin:keyHintLabel="5" + latin:additionalMoreKeys="5,٥" /> + <!-- U+0639: "ع" ARABIC LETTER AIN + U+0666: "٦" ARABIC-INDIC DIGIT SIX --> + <Key + latin:keyLabel="ع" + latin:keyHintLabel="6" + latin:additionalMoreKeys="6,٦" /> + <!-- U+0647: "ه" ARABIC LETTER HEH + U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM + U+0647 U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER + U+0667: "٧" ARABIC-INDIC DIGIT SEVEN --> + <Key + latin:keyLabel="ه" + latin:keyHintLabel="7" + latin:additionalMoreKeys="7,٧" + latin:moreKeys="ﻫ|ه‍" /> + <!-- U+062E: "خ" ARABIC LETTER KHAH + U+0668: "٨" ARABIC-INDIC DIGIT EIGHT --> + <Key + latin:keyLabel="خ" + latin:keyHintLabel="8" + latin:additionalMoreKeys="8,٨" /> + <!-- U+062D: "ح" ARABIC LETTER HAH + U+0669: "٩" ARABIC-INDIC DIGIT NINE --> + <Key + latin:keyLabel="ح" + latin:keyHintLabel="9" + latin:additionalMoreKeys="9,٩" /> + <!-- U+062C: "ج" ARABIC LETTER JEEM + U+0686: "چ" ARABIC LETTER TCHEH + U+0660: "٠" ARABIC-INDIC DIGIT ZERO --> + <Key + latin:keyLabel="ج" + latin:keyHintLabel="0" + latin:additionalMoreKeys="0,٠" + latin:moreKeys="چ" /> +</merge> diff --git a/java/res/xml/rowkeys_arabic2.xml b/java/res/xml/rowkeys_arabic2.xml new file mode 100644 index 000000000..f86aae014 --- /dev/null +++ b/java/res/xml/rowkeys_arabic2.xml @@ -0,0 +1,83 @@ +<?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" +> + <!-- U+0634: "ش" ARABIC LETTER SHEEN + U+069C: "ڜ" ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE --> + <!-- TODO: DroidSansArabic lacks the glyph of U+069C ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE --> + <Key + latin:keyLabel="ش" + latin:moreKeys="ڜ" /> + <!-- U+0633: "س" ARABIC LETTER SEEN --> + <Key + latin:keyLabel="س" /> + <!-- U+064A: "ي" ARABIC LETTER YEH + U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE + U+0649: "ى" ARABIC LETTER ALEF MAKSURA --> + <Key + latin:keyLabel="ي" + latin:moreKeys="ئ,ى" /> + <!-- U+0628: "ب" ARABIC LETTER BEH + U+067E: "پ" ARABIC LETTER PEH --> + <Key + latin:keyLabel="ب" + latin:moreKeys="پ" /> + <!-- U+0644: "ل" ARABIC LETTER LAM + U+FEFB: "ﻻ" ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM + U+0627: "ا" ARABIC LETTER ALEF + U+FEF7: "ﻷ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM + U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE + U+FEF9: "ﻹ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM + U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW + U+FEF5: "ﻵ" ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM + U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE --> + <Key + latin:keyLabel="ل" + latin:moreKeys="ﻻ|لا,ﻷ|لأ,ﻹ|لإ,ﻵ|لآ" /> + <!-- U+0627: "ا" ARABIC LETTER ALEF + U+0621: "ء" ARABIC LETTER HAMZA + U+0671: "ٱ" ARABIC LETTER ALEF WASLA + U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE + U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW + U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE --> + <Key + latin:keyLabel="ا" + latin:moreKeys="ء,ٱ,أ,إ,آ" /> + <!-- U+062A: "ت" ARABIC LETTER TEH + U+062B: "ﺙ" ARABIC LETTER THEH --> + <Key + latin:keyLabel="ت" + latin:moreKeys="ث" /> + <!-- U+0646: "ن" ARABIC LETTER NOON --> + <Key + latin:keyLabel="ن" /> + <!-- U+0645: "م" ARABIC LETTER MEEM --> + <Key + latin:keyLabel="م" /> + <!-- U+0643: "ك" ARABIC LETTER KAF + U+06AF: "گ" ARABIC LETTER GAF + U+06A9: "ک" ARABIC LETTER KEHEH --> + <Key + latin:keyLabel="ك" + latin:moreKeys="گ,ک" + latin:keyWidth="fillRight" /> +</merge> diff --git a/java/res/xml/rowkeys_arabic3.xml b/java/res/xml/rowkeys_arabic3.xml new file mode 100644 index 000000000..9e9eac0d9 --- /dev/null +++ b/java/res/xml/rowkeys_arabic3.xml @@ -0,0 +1,52 @@ +<?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" +> + <!-- U+0638: "ظ" ARABIC LETTER ZAH --> + <Key + latin:keyLabel="ظ" /> + <!-- U+0637: "ط" ARABIC LETTER TAH --> + <Key + latin:keyLabel="ط" /> + <!-- U+0630: "ذ" ARABIC LETTER THAL --> + <Key + latin:keyLabel="ذ" /> + <!-- U+062F: "د" ARABIC LETTER DAL --> + <Key + latin:keyLabel="د" /> + <!-- U+0632: "ز" ARABIC LETTER ZAIN + U+0698: "ژ" ARABIC LETTER JEH --> + <Key + latin:keyLabel="ز" + latin:moreKeys="ژ" /> + <!-- U+0631: "ر" ARABIC LETTER REH --> + <Key + latin:keyLabel="ر" /> + <!-- U+0629: "ة" ARABIC LETTER TEH MARBUTA --> + <Key + latin:keyLabel="ة" /> + <!-- U+0648: "و" ARABIC LETTER WAW + U+0624: "ﺅ" ARABIC LETTER WAW WITH HAMZA ABOVE --> + <Key + latin:keyLabel="و" + latin:moreKeys="ؤ" /> +</merge> diff --git a/java/res/xml/rowkeys_bulgarian1.xml b/java/res/xml/rowkeys_bulgarian1.xml new file mode 100644 index 000000000..adeecaf20 --- /dev/null +++ b/java/res/xml/rowkeys_bulgarian1.xml @@ -0,0 +1,79 @@ +<?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" +> + <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE --> + <Key + latin:keyLabel="ч" + latin:keyHintLabel="1" + latin:additionalMoreKeys="1" /> + <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA --> + <Key + latin:keyLabel="ш" + latin:keyHintLabel="2" + latin:additionalMoreKeys="2" /> + <!-- U+0435: "е" CYRILLIC SMALL LETTER IE --> + <Key + latin:keyLabel="е" + latin:keyHintLabel="3" + latin:additionalMoreKeys="3" /> + <!-- U+0440: "р" CYRILLIC SMALL LETTER ER --> + <Key + latin:keyLabel="р" + latin:keyHintLabel="4" + latin:additionalMoreKeys="4" /> + <!-- U+0442: "т" CYRILLIC SMALL LETTER TE --> + <Key + latin:keyLabel="т" + latin:keyHintLabel="5" + latin:additionalMoreKeys="5" /> + <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN --> + <Key + latin:keyLabel="ъ" + latin:keyHintLabel="6" + latin:additionalMoreKeys="6" /> + <!-- U+0443: "у" CYRILLIC SMALL LETTER U --> + <Key + latin:keyLabel="у" + latin:keyHintLabel="7" + latin:additionalMoreKeys="7" /> + <!-- U+0438: "и" CYRILLIC SMALL LETTER I + U+045D: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE --> + <Key + latin:keyLabel="и" + latin:keyHintLabel="8" + latin:additionalMoreKeys="8" + latin:moreKeys="ѝ" /> + <!-- U+043E: "о" CYRILLIC SMALL LETTER O --> + <Key + latin:keyLabel="о" + latin:keyHintLabel="9" + latin:additionalMoreKeys="9" /> + <!-- U+043F: "п" CYRILLIC SMALL LETTER PE --> + <Key + latin:keyLabel="п" + latin:keyHintLabel="0" + latin:additionalMoreKeys="0" /> + <!-- U+044F: "я" CYRILLIC SMALL LETTER YA --> + <Key + latin:keyLabel="я" /> +</merge> diff --git a/java/res/xml/rowkeys_bulgarian2.xml b/java/res/xml/rowkeys_bulgarian2.xml new file mode 100644 index 000000000..599edd3ed --- /dev/null +++ b/java/res/xml/rowkeys_bulgarian2.xml @@ -0,0 +1,57 @@ +<?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" +> + <!-- U+0430: "а" CYRILLIC SMALL LETTER A --> + <Key + latin:keyLabel="а" /> + <!-- U+0441: "с" CYRILLIC SMALL LETTER ES --> + <Key + latin:keyLabel="с" /> + <!-- U+0434: "д" CYRILLIC SMALL LETTER DE --> + <Key + latin:keyLabel="д" /> + <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF --> + <Key + latin:keyLabel="ф" /> + <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE --> + <Key + latin:keyLabel="г" /> + <!-- U+0445: "х" CYRILLIC SMALL LETTER HA --> + <Key + latin:keyLabel="х" /> + <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I --> + <Key + latin:keyLabel="й" /> + <!-- U+043A: "к" CYRILLIC SMALL LETTER KA --> + <Key + latin:keyLabel="к" /> + <!-- U+043B: "л" CYRILLIC SMALL LETTER EL --> + <Key + latin:keyLabel="л" /> + <!-- U+0449: "щ" CYRILLIC SMALL LETTER SHCHA --> + <Key + latin:keyLabel="щ" /> + <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN --> + <Key + latin:keyLabel="ь" /> +</merge> diff --git a/java/res/xml/rowkeys_bulgarian3.xml b/java/res/xml/rowkeys_bulgarian3.xml new file mode 100644 index 000000000..19872cdfe --- /dev/null +++ b/java/res/xml/rowkeys_bulgarian3.xml @@ -0,0 +1,48 @@ +<?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" +> + <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE --> + <Key + latin:keyLabel="з" /> + <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE --> + <Key + latin:keyLabel="ж" /> + <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE --> + <Key + latin:keyLabel="ц" /> + <!-- U+0432: "в" CYRILLIC SMALL LETTER VE --> + <Key + latin:keyLabel="в" /> + <!-- U+0431: "б" CYRILLIC SMALL LETTER BE --> + <Key + latin:keyLabel="б" /> + <!-- U+043D: "н" CYRILLIC SMALL LETTER EN --> + <Key + latin:keyLabel="н" /> + <!-- U+043C: "м" CYRILLIC SMALL LETTER EM --> + <Key + latin:keyLabel="м" /> + <!-- U+044E: "ю" CYRILLIC SMALL LETTER YU --> + <Key + latin:keyLabel="ю" /> +</merge> diff --git a/java/res/xml/rows_arabic.xml b/java/res/xml/rows_arabic.xml index 84f7a3cb6..6449af219 100644 --- a/java/res/xml/rows_arabic.xml +++ b/java/res/xml/rows_arabic.xml @@ -26,177 +26,21 @@ <Row latin:keyWidth="10%p" > - <!-- U+0636: "ض" ARABIC LETTER DAD - U+0661: "١" ARABIC-INDIC DIGIT ONE --> - <Key - latin:keyLabel="ض" - latin:keyHintLabel="1" - latin:additionalMoreKeys="1,١" /> - <!-- U+0635: "ص" ARABIC LETTER SAD - U+0662: "٢" ARABIC-INDIC DIGIT TWO --> - <Key - latin:keyLabel="ص" - latin:keyHintLabel="2" - latin:additionalMoreKeys="2,٢" /> - <!-- U+0642: "ق" ARABIC LETTER QAF - U+06A8: "ڨ" ARABIC LETTER QAF WITH THREE DOTS ABOVE - U+0663: "٣" ARABIC-INDIC DIGIT THREE --> - <!-- TODO: DroidSansArabic lacks the glyph of U+06A8 ARABIC LETTER QAF WITH THREE DOTS ABOVE --> - <Key - latin:keyLabel="ق" - latin:keyHintLabel="3" - latin:additionalMoreKeys="3,٣" - latin:moreKeys="ڨ" /> - <!-- U+0641: "ف" ARABIC LETTER FEH - U+06A4: "ڤ" ARABIC LETTER VEH - U+06A2: "ڢ" ARABIC LETTER FEH WITH DOT MOVED BELOW - U+06A5: "ڥ" ARABIC LETTER FEH WITH THREE DOTS BELOW - U+0664: "٤" ARABIC-INDIC DIGIT FOUR --> - <!-- TODO: DroidSansArabic lacks the glyph of U+06A2 ARABIC LETTER FEH WITH DOT MOVED BELOW --> - <!-- TODO: DroidSansArabic lacks the glyph of U+06A5 ARABIC LETTER FEH WITH THREE DOTS BELOW --> - <Key - latin:keyLabel="ف" - latin:keyHintLabel="4" - latin:additionalMoreKeys="4,٤" - latin:moreKeys="ڤ,ڢ,ڥ" /> - <!-- U+063A: "غ" ARABIC LETTER GHAIN - U+0665: "٥" ARABIC-INDIC DIGIT FIVE --> - <Key - latin:keyLabel="غ" - latin:keyHintLabel="5" - latin:additionalMoreKeys="5,٥" /> - <!-- U+0639: "ع" ARABIC LETTER AIN - U+0666: "٦" ARABIC-INDIC DIGIT SIX --> - <Key - latin:keyLabel="ع" - latin:keyHintLabel="6" - latin:additionalMoreKeys="6,٦" /> - <!-- U+0647: "ه" ARABIC LETTER HEH - U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM - U+0647 U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER - U+0667: "٧" ARABIC-INDIC DIGIT SEVEN --> - <Key - latin:keyLabel="ه" - latin:keyHintLabel="7" - latin:additionalMoreKeys="7,٧" - latin:moreKeys="ﻫ|ه‍" /> - <!-- U+062E: "خ" ARABIC LETTER KHAH - U+0668: "٨" ARABIC-INDIC DIGIT EIGHT --> - <Key - latin:keyLabel="خ" - latin:keyHintLabel="8" - latin:additionalMoreKeys="8,٨" /> - <!-- U+062D: "ح" ARABIC LETTER HAH - U+0669: "٩" ARABIC-INDIC DIGIT NINE --> - <Key - latin:keyLabel="ح" - latin:keyHintLabel="9" - latin:additionalMoreKeys="9,٩" /> - <!-- U+062C: "ج" ARABIC LETTER JEEM - U+0686: "چ" ARABIC LETTER TCHEH - U+0660: "٠" ARABIC-INDIC DIGIT ZERO --> - <Key - latin:keyLabel="ج" - latin:keyHintLabel="0" - latin:additionalMoreKeys="0,٠" - latin:moreKeys="چ" - latin:keyWidth="fillRight" /> + <include + latin:keyboardLayout="@xml/rowkeys_arabic1" /> </Row> <Row latin:keyWidth="10%p" > - <!-- U+0634: "ش" ARABIC LETTER SHEEN - U+069C: "ڜ" ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE --> - <!-- TODO: DroidSansArabic lacks the glyph of U+069C ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE --> - <Key - latin:keyLabel="ش" - latin:moreKeys="ڜ" /> - <!-- U+0633: "س" ARABIC LETTER SEEN --> - <Key - latin:keyLabel="س" /> - <!-- U+064A: "ي" ARABIC LETTER YEH - U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE - U+0649: "ى" ARABIC LETTER ALEF MAKSURA --> - <Key - latin:keyLabel="ي" - latin:moreKeys="ئ,ى" /> - <!-- U+0628: "ب" ARABIC LETTER BEH - U+067E: "پ" ARABIC LETTER PEH --> - <Key - latin:keyLabel="ب" - latin:moreKeys="پ" /> - <!-- U+0644: "ل" ARABIC LETTER LAM - U+FEFB: "ﻻ" ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM - U+0627: "ا" ARABIC LETTER ALEF - U+FEF7: "ﻷ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM - U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE - U+FEF9: "ﻹ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM - U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW - U+FEF5: "ﻵ" ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM - U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE --> - <Key - latin:keyLabel="ل" - latin:moreKeys="ﻻ|لا,ﻷ|لأ,ﻹ|لإ,ﻵ|لآ" /> - <!-- U+0627: "ا" ARABIC LETTER ALEF - U+0621: "ء" ARABIC LETTER HAMZA - U+0671: "ٱ" ARABIC LETTER ALEF WASLA - U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE - U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW - U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE --> - <Key - latin:keyLabel="ا" - latin:moreKeys="ء,ٱ,أ,إ,آ" /> - <!-- U+062A: "ت" ARABIC LETTER TEH - U+062B: "ﺙ" ARABIC LETTER THEH --> - <Key - latin:keyLabel="ت" - latin:moreKeys="ث" /> - <!-- U+0646: "ن" ARABIC LETTER NOON --> - <Key - latin:keyLabel="ن" /> - <!-- U+0645: "م" ARABIC LETTER MEEM --> - <Key - latin:keyLabel="م" /> - <!-- U+0643: "ك" ARABIC LETTER KAF - U+06AF: "گ" ARABIC LETTER GAF - U+06A9: "ک" ARABIC LETTER KEHEH --> - <Key - latin:keyLabel="ك" - latin:moreKeys="گ,ک" - latin:keyWidth="fillRight" /> + <include + latin:keyboardLayout="@xml/rowkeys_arabic2" /> </Row> <Row latin:keyWidth="10%p" > - <!-- U+0638: "ظ" ARABIC LETTER ZAH --> - <Key - latin:keyLabel="ظ" + <include + latin:keyboardLayout="@xml/rowkeys_arabic3" latin:keyXPos="5.0%p" /> - <!-- U+0637: "ط" ARABIC LETTER TAH --> - <Key - latin:keyLabel="ط" /> - <!-- U+0630: "ذ" ARABIC LETTER THAL --> - <Key - latin:keyLabel="ذ" /> - <!-- U+062F: "د" ARABIC LETTER DAL --> - <Key - latin:keyLabel="د" /> - <!-- U+0632: "ز" ARABIC LETTER ZAIN - U+0698: "ژ" ARABIC LETTER JEH --> - <Key - latin:keyLabel="ز" - latin:moreKeys="ژ" /> - <!-- U+0631: "ر" ARABIC LETTER REH --> - <Key - latin:keyLabel="ر" /> - <!-- U+0629: "ة" ARABIC LETTER TEH MARBUTA --> - <Key - latin:keyLabel="ة" /> - <!-- U+0648: "و" ARABIC LETTER WAW - U+0624: "ﺅ" ARABIC LETTER WAW WITH HAMZA ABOVE --> - <Key - latin:keyLabel="و" - latin:moreKeys="ؤ" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillRight" diff --git a/java/res/xml/rows_bulgarian.xml b/java/res/xml/rows_bulgarian.xml index 3d954a900..883c2833d 100644 --- a/java/res/xml/rows_bulgarian.xml +++ b/java/res/xml/rows_bulgarian.xml @@ -26,100 +26,14 @@ <Row latin:keyWidth="9.091%p" > - <!-- U+0447: "ч" CYRILLIC SMALL LETTER CHE --> - <Key - latin:keyLabel="ч" - latin:keyHintLabel="1" - latin:additionalMoreKeys="1" /> - <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA --> - <Key - latin:keyLabel="ш" - latin:keyHintLabel="2" - latin:additionalMoreKeys="2" /> - <!-- U+0435: "е" CYRILLIC SMALL LETTER IE --> - <Key - latin:keyLabel="е" - latin:keyHintLabel="3" - latin:additionalMoreKeys="3" /> - <!-- U+0440: "р" CYRILLIC SMALL LETTER ER --> - <Key - latin:keyLabel="р" - latin:keyHintLabel="4" - latin:additionalMoreKeys="4" /> - <!-- U+0442: "т" CYRILLIC SMALL LETTER TE --> - <Key - latin:keyLabel="т" - latin:keyHintLabel="5" - latin:additionalMoreKeys="5" /> - <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN --> - <Key - latin:keyLabel="ъ" - latin:keyHintLabel="6" - latin:additionalMoreKeys="6" /> - <!-- U+0443: "у" CYRILLIC SMALL LETTER U --> - <Key - latin:keyLabel="у" - latin:keyHintLabel="7" - latin:additionalMoreKeys="7" /> - <!-- U+0438: "и" CYRILLIC SMALL LETTER I - U+045D: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE --> - <Key - latin:keyLabel="и" - latin:keyHintLabel="8" - latin:additionalMoreKeys="8" - latin:moreKeys="ѝ" /> - <!-- U+043E: "о" CYRILLIC SMALL LETTER O --> - <Key - latin:keyLabel="о" - latin:keyHintLabel="9" - latin:additionalMoreKeys="9" /> - <!-- U+043F: "п" CYRILLIC SMALL LETTER PE --> - <Key - latin:keyLabel="п" - latin:keyHintLabel="0" - latin:additionalMoreKeys="0" /> - <!-- U+044F: "я" CYRILLIC SMALL LETTER YA --> - <Key - latin:keyLabel="я" - latin:keyWidth="fillRight" /> + <include + latin:keyboardLayout="@xml/rowkeys_bulgarian1" /> </Row> <Row latin:keyWidth="9.091%p" > - <!-- U+0430: "а" CYRILLIC SMALL LETTER A --> - <Key - latin:keyLabel="а" /> - <!-- U+0441: "с" CYRILLIC SMALL LETTER ES --> - <Key - latin:keyLabel="с" /> - <!-- U+0434: "д" CYRILLIC SMALL LETTER DE --> - <Key - latin:keyLabel="д" /> - <!-- U+0444: "ф" CYRILLIC SMALL LETTER EF --> - <Key - latin:keyLabel="ф" /> - <!-- U+0433: "г" CYRILLIC SMALL LETTER GHE --> - <Key - latin:keyLabel="г" /> - <!-- U+0445: "х" CYRILLIC SMALL LETTER HA --> - <Key - latin:keyLabel="х" /> - <!-- U+0439: "й" CYRILLIC SMALL LETTER SHORT I --> - <Key - latin:keyLabel="й" /> - <!-- U+043A: "к" CYRILLIC SMALL LETTER KA --> - <Key - latin:keyLabel="к" /> - <!-- U+043B: "л" CYRILLIC SMALL LETTER EL --> - <Key - latin:keyLabel="л" /> - <!-- U+0449: "щ" CYRILLIC SMALL LETTER SHCHA --> - <Key - latin:keyLabel="щ" /> - <!-- U+044C: "ь" CYRILLIC SMALL LETTER SOFT SIGN --> - <Key - latin:keyLabel="ь" - latin:keyWidth="fillRight" /> + <include + latin:keyboardLayout="@xml/rowkeys_bulgarian2" /> </Row> <Row latin:keyWidth="9.091%p" @@ -127,30 +41,8 @@ <Key latin:keyStyle="shiftKeyStyle" latin:keyWidth="13.636%p" /> - <!-- U+0437: "з" CYRILLIC SMALL LETTER ZE --> - <Key - latin:keyLabel="з" /> - <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE --> - <Key - latin:keyLabel="ж" /> - <!-- U+0446: "ц" CYRILLIC SMALL LETTER TSE --> - <Key - latin:keyLabel="ц" /> - <!-- U+0432: "в" CYRILLIC SMALL LETTER VE --> - <Key - latin:keyLabel="в" /> - <!-- U+0431: "б" CYRILLIC SMALL LETTER BE --> - <Key - latin:keyLabel="б" /> - <!-- U+043D: "н" CYRILLIC SMALL LETTER EN --> - <Key - latin:keyLabel="н" /> - <!-- U+043C: "м" CYRILLIC SMALL LETTER EM --> - <Key - latin:keyLabel="м" /> - <!-- U+044E: "ю" CYRILLIC SMALL LETTER YU --> - <Key - latin:keyLabel="ю" /> + <include + latin:keyboardLayout="@xml/rowkeys_bulgarian3" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillRight" /> diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 13ba44be0..a3f422c9c 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -1853,21 +1853,19 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar // in most cases, suggestion count is 1 when typed word's length is 1, but we do always // need to clear the previous state when the user starts typing a word (i.e. typed word's // length == 1). - if (typedWord != null) { - if (builder.size() > 1 || typedWord.length() == 1 || (!allowsToBeAutoCorrected) - || mSuggestionsView.isShowingAddToDictionaryHint()) { - builder.setTypedWordValid(!allowsToBeAutoCorrected).setHasMinimalSuggestion( - autoCorrectionAvailable); - } else { - SuggestedWords previousSuggestions = mSuggestionsView.getSuggestions(); - if (previousSuggestions == mSettingsValues.mSuggestPuncList) { - if (builder.size() == 0) { - return; - } - previousSuggestions = SuggestedWords.EMPTY; + if (builder.size() > 1 || typedWord.length() == 1 || (!allowsToBeAutoCorrected) + || mSuggestionsView.isShowingAddToDictionaryHint()) { + builder.setTypedWordValid(!allowsToBeAutoCorrected).setHasMinimalSuggestion( + autoCorrectionAvailable); + } else { + SuggestedWords previousSuggestions = mSuggestionsView.getSuggestions(); + if (previousSuggestions == mSettingsValues.mSuggestPuncList) { + if (builder.size() == 0) { + return; } - builder.addTypedWordAndPreviousSuggestions(typedWord, previousSuggestions); + previousSuggestions = SuggestedWords.EMPTY; } + builder.addTypedWordAndPreviousSuggestions(typedWord, previousSuggestions); } if (Suggest.shouldBlockAutoCorrectionBySafetyNet(builder, mSuggest, mSettingsValues.mAutoCorrectionThreshold)) { |