diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/xml-sw600dp/rowkeys_farsi1.xml | 5 | ||||
| -rw-r--r-- | java/res/xml/key_styles_currency.xml | 11 | ||||
| -rw-r--r-- | java/res/xml/method.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/rowkeys_farsi1.xml | 7 | ||||
| -rw-r--r-- | java/res/xml/rowkeys_farsi3.xml | 18 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java | 40 |
6 files changed, 42 insertions, 41 deletions
diff --git a/java/res/xml-sw600dp/rowkeys_farsi1.xml b/java/res/xml-sw600dp/rowkeys_farsi1.xml index ab260a460..53208f286 100644 --- a/java/res/xml-sw600dp/rowkeys_farsi1.xml +++ b/java/res/xml-sw600dp/rowkeys_farsi1.xml @@ -45,12 +45,11 @@ <!-- U+0647: "ه" ARABIC LETTER HEH U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM U+0647/U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER - U+06C0: "ۀ" ARABIC LETTER HEH WITH YEH ABOVE + U+0647/U+0654: ARABIC LETTER HEH + ARABIC HAMZA ABOVE U+0629: "ة" ARABIC LETTER TEH MARBUTA --> - <!-- TODO: DroidSansArabic lacks the glyph of U+06C0 ARABIC LETTER HEH WITH YEH ABOVE --> <Key latin:keyLabel="ه" - latin:moreKeys="ﻫ|ه‍,ۀ,ة,%" /> + latin:moreKeys="ﻫ|ه‍,هٔ,ة,%" /> <!-- U+062E: "خ" ARABIC LETTER KHAH --> <Key latin:keyLabel="خ" /> diff --git a/java/res/xml/key_styles_currency.xml b/java/res/xml/key_styles_currency.xml index d5c6a87b9..6dea16f89 100644 --- a/java/res/xml/key_styles_currency.xml +++ b/java/res/xml/key_styles_currency.xml @@ -105,6 +105,7 @@ latin:languageCode="fa" > <!-- U+FDFC: "﷼" RIAL SIGN + U+060B: "؋" AFGHANI SIGN U+00A3: "£" POUND SIGN U+20AC: "€" EURO SIGN U+00A2: "¢" CENT SIGN --> @@ -112,20 +113,20 @@ <key-style latin:styleName="currencyKeyStyle" latin:keyLabel="﷼" - latin:moreKeys="!text/more_keys_for_currency_general" /> + latin:moreKeys="!text/more_keys_for_currency_general,؋" /> <key-style latin:styleName="moreCurrency1KeyStyle" - latin:keyLabel="£" /> + latin:keyLabel="£" /> <key-style latin:styleName="moreCurrency2KeyStyle" - latin:keyLabel="€" /> + latin:keyLabel="€" /> <key-style latin:styleName="moreCurrency3KeyStyle" latin:keyLabel="$" - latin:moreKeys="¢" /> + latin:moreKeys="¢" /> <key-style latin:styleName="moreCurrency4KeyStyle" - latin:keyLabel="¢" /> + latin:keyLabel="¢" /> </case> <!-- United Kingdom --> <case diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml index a0262846b..07bff098b 100644 --- a/java/res/xml/method.xml +++ b/java/res/xml/method.xml @@ -49,7 +49,7 @@ lt: Lithuanian/qwerty lv: Latvian/qwerty mk: Macedonian/south_slavic - nb: Norwaian Bokmål/nordic + nb: Norwegian Bokmål/nordic nl: Dutch/qwerty pl: Polish/qwerty pt_BR: Portuguese Brazil/qwerty diff --git a/java/res/xml/rowkeys_farsi1.xml b/java/res/xml/rowkeys_farsi1.xml index 15cb80182..81618af77 100644 --- a/java/res/xml/rowkeys_farsi1.xml +++ b/java/res/xml/rowkeys_farsi1.xml @@ -22,9 +22,11 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <!-- U+0635: "ص" ARABIC LETTER SAD + U+0636: "ض" ARABIC LETTER DAD U+06F1: "۱" EXTENDED ARABIC-INDIC DIGIT ONE --> <Key latin:keyLabel="ص" + latin:moreKeys="ض,%" latin:keyHintLabel="1" latin:additionalMoreKeys="1,۱" /> <!-- U+0642: "ق" ARABIC LETTER QAF @@ -54,13 +56,12 @@ <!-- U+0647: "ه" ARABIC LETTER HEH U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM U+0647/U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER - U+06C0: "ۀ" ARABIC LETTER HEH WITH YEH ABOVE + U+0647/U+0654: ARABIC LETTER HEH + ARABIC HAMZA ABOVE U+0629: "ة" ARABIC LETTER TEH MARBUTA U+06F6: "۶" EXTENDED ARABIC-INDIC DIGIT SIX --> - <!-- TODO: DroidSansArabic lacks the glyph of U+06C0 ARABIC LETTER HEH WITH YEH ABOVE --> <Key latin:keyLabel="ه" - latin:moreKeys="ﻫ|ه‍,ۀ,ة,%" + latin:moreKeys="ﻫ|ه‍,هٔ,ة,%" latin:keyHintLabel="6" latin:additionalMoreKeys="6,۶" /> <!-- U+062E: "خ" ARABIC LETTER KHAH diff --git a/java/res/xml/rowkeys_farsi3.xml b/java/res/xml/rowkeys_farsi3.xml index 8db56e340..44710e06a 100644 --- a/java/res/xml/rowkeys_farsi3.xml +++ b/java/res/xml/rowkeys_farsi3.xml @@ -26,20 +26,20 @@ <Key latin:keyLabel="ط" latin:moreKeys="ظ" /> - <!-- U+0698: "ژ" ARABIC LETTER JEH --> + <!-- U+0632: "ز" ARABIC LETTER ZAIN + U+0698: "ژ" ARABIC LETTER JEH --> <Key - latin:keyLabel="ژ" /> - <!-- U+0632: "ز" ARABIC LETTER ZAIN --> - <Key - latin:keyLabel="ز" /> + latin:keyLabel="ز" + latin:moreKeys="ژ" /> <!-- U+0631: "ر" ARABIC LETTER REH --> <Key latin:keyLabel="ر" /> - <!-- U+062F: "د" ARABIC LETTER DAL - U+0630: "ذ" ARABIC LETTER THAL --> + <!-- U+0630: "ذ" ARABIC LETTER THAL --> + <Key + latin:keyLabel="ذ" /> + <!-- U+062F: "د" ARABIC LETTER DAL --> <Key - latin:keyLabel="د" - latin:moreKeys="ذ" /> + latin:keyLabel="د" /> <!-- U+067E: "پ" ARABIC LETTER PEH --> <Key latin:keyLabel="پ" /> diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java index 14d61e228..917e233a8 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java @@ -428,23 +428,23 @@ public final class KeyboardTextsSet { // U+201F: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK /* 54 */ "!fixedColumnOrder!3,\u2039|\u203A,\u2264|\u2265,\u00AB|\u00BB", /* 55 */ "!fixedColumnOrder!3,\u203A|\u2039,\u2265|\u2264,\u00BB|\u00AB", - // U+064F: "ُ" ARABIC DAMMA - // U+064C: "ٌ" ARABIC DAMMATAN - // U+0651: "ّ" ARABIC SHADDA + // U+0655: "ٕ" ARABIC HAMZA BELOW + // U+0654: "ٔ" ARABIC HAMZA ABOVE // U+0652: "ْ" ARABIC SUKUN - // U+0653: "ٓ" ARABIC MADDAH ABOVE // U+064D: "ٍ" ARABIC KASRATAN + // U+064C: "ٌ" ARABIC DAMMATAN // U+064B: "ً" ARABIC FATHATAN + // U+0651: "ّ" ARABIC SHADDA + // U+0656: "ٖ" ARABIC SUBSCRIPT ALEF + // U+0670: "ٰ" ARABIC LETTER SUPERSCRIPT ALEF + // U+0653: "ٓ" ARABIC MADDAH ABOVE // U+0650: "ِ" ARABIC KASRA + // U+064F: "ُ" ARABIC DAMMA // U+064E: "َ" ARABIC FATHA // U+0640: "ـ" ARABIC TATWEEL - // U+0656: "ٖ" ARABIC SUBSCRIPT ALEF - // U+0670: "ٰ" ARABIC LETTER SUPERSCRIPT ALEF - // U+0655: "ٕ" ARABIC HAMZA BELOW - // U+0654: "ٔ" ARABIC HAMZA ABOVE // In order to make Tatweel easily distinguishable from other punctuations, we use consecutive Tatweels only for its displayed label. - /* 56 */ "!fixedColumnOrder!5,\u064F,\u064C,\u0651,\u0652,\u0653,\u064D,\u064B,\u0650,\u064E,\u0640\u0640\u0640|\u0640,\u0656,\u0670,\u0655,\u0654", - /* 57 */ "\u064F", + /* 56 */ "!fixedColumnOrder!7,\u0655,\u0654,\u0652,\u064D,\u064C,\u064B,\u0651,\u0656,\u0670,\u0653,\u0650,\u064F,\u064E,\u0640\u0640\u0640|\u0640", + /* 57 */ "\u0651", // U+0661: "١" ARABIC-INDIC DIGIT ONE /* 58 */ "\u0661", // U+0662: "٢" ARABIC-INDIC DIGIT TWO @@ -1033,22 +1033,22 @@ public final class KeyboardTextsSet { // U+201F: "‟" DOUBLE HIGH-REVERSED-9 QUOTATION MARK /* 54 */ "!fixedColumnOrder!3,\u2039|\u203A,\u2264|\u2265,\u00AB|\u00BB", /* 55 */ "!fixedColumnOrder!3,\u203A|\u2039,\u2265|\u2264,\u00BB|\u00AB", - // U+0651: "ّ" ARABIC SHADDA - // U+064F: "ُ" ARABIC DAMMA - // U+0650: "ِ" ARABIC KASRA - // U+064E: "َ" ARABIC FATHA - // U+0653: "ٓ" ARABIC MADDAH ABOVE // U+0655: "ٕ" ARABIC HAMZA BELOW - // U+0654: "ٔ" ARABIC HAMZA ABOVE - // U+064D: "ٍ" ARABIC KASRATAN - // U+064B: "ً" ARABIC FATHATAN // U+0652: "ْ" ARABIC SUKUN - // U+0640: "ـ" ARABIC TATWEEL + // U+0651: "ّ" ARABIC SHADDA // U+064C: "ٌ" ARABIC DAMMATAN + // U+064D: "ٍ" ARABIC KASRATAN + // U+064B: "ً" ARABIC FATHATAN + // U+0654: "ٔ" ARABIC HAMZA ABOVE // U+0656: "ٖ" ARABIC SUBSCRIPT ALEF // U+0670: "ٰ" ARABIC LETTER SUPERSCRIPT ALEF + // U+0653: "ٓ" ARABIC MADDAH ABOVE + // U+064F: "ُ" ARABIC DAMMA + // U+0650: "ِ" ARABIC KASRA + // U+064E: "َ" ARABIC FATHA + // U+0640: "ـ" ARABIC TATWEEL // In order to make Tatweel easily distinguishable from other punctuations, we use consecutive Tatweels only for its displayed label. - /* 56 */ "!fixedColumnOrder!5,\u0651,\u064F,\u0650,\u064E,\u0653,\u0655,\u0654,\u064D,\u064B,\u0652,\u0640\u0640\u0640|\u0640,\u064C,\u0656,\u0670", + /* 56 */ "!fixedColumnOrder!7,\u0655,\u0652,\u0651,\u064C,\u064D,\u064B,\u0654,\u0656,\u0670,\u0653,\u064F,\u0650,\u064E,\u0640\u0640\u0640|\u0640", /* 57 */ "\u0653", // U+06F1: "۱" EXTENDED ARABIC-INDIC DIGIT ONE /* 58 */ "\u06F1", |