diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-03-17 11:56:13 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2014-03-17 11:56:13 +0900 |
| commit | 538abc27dc365fb4d7799ab7f61523a92040a236 (patch) | |
| tree | df5131f63b2aba0c6eb336d986085cb46bfd606c | |
| parent | bef6a4e20965a8e664ee92b3c75405a6754afb4e (diff) | |
| download | latinime-538abc27dc365fb4d7799ab7f61523a92040a236.tar.gz latinime-538abc27dc365fb4d7799ab7f61523a92040a236.tar.xz latinime-538abc27dc365fb4d7799ab7f61523a92040a236.zip | |
Fix Arabic keyboard text and test comments
Bug: 13017434
Change-Id: Iec2ddab719e0c68a70bcf56a90eb4522c5fd7978
4 files changed, 7 insertions, 11 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java index 387ed3945..e056a2601 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java @@ -525,10 +525,10 @@ public final class KeyboardTextsTable { null, null, null, null, null, null, null, null, null, null, /* ~ more_keys_for_n */ // Label for "switch to alphabetic" key. - // U+0623: "ا" ARABIC LETTER ALEF + // U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE // U+200C: ZERO WIDTH NON-JOINER // U+0628: "ب" ARABIC LETTER BEH - // U+062C: "پ" ARABIC LETTER PEH + // U+062C: "ج" ARABIC LETTER JEEM /* label_to_alpha_key */ "\u0623\u200C\u0628\u200C\u062C", /* more_keys_for_y ~ */ null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Arabic.java b/tests/src/com/android/inputmethod/keyboard/layout/Arabic.java index 65b050be7..6fbede8a7 100644 --- a/tests/src/com/android/inputmethod/keyboard/layout/Arabic.java +++ b/tests/src/com/android/inputmethod/keyboard/layout/Arabic.java @@ -95,10 +95,10 @@ public final class Arabic extends LayoutBase { return ARABIC_DIACRITICS; } - // U+0623: "ا" ARABIC LETTER ALEF + // U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE // U+200C: ZERO WIDTH NON-JOINER // U+0628: "ب" ARABIC LETTER BEH - // U+062C: "پ" ARABIC LETTER PEH + // U+062C: "ج" ARABIC LETTER JEEM private static final ExpectedKey ARABIC_ALPHABET_KEY = key( "\u0623\u200C\u0628\u200C\u062C", Constants.CODE_SWITCH_ALPHA_SYMBOL); // U+0663: "٣" ARABIC-INDIC DIGIT THREE @@ -107,10 +107,6 @@ public final class Arabic extends LayoutBase { // U+061F: "؟" ARABIC QUESTION MARK private static final ExpectedKey ARABIC_SYMBOLS_KEY = key( "\u0663\u0662\u0661\u061F", Constants.CODE_SWITCH_ALPHA_SYMBOL); - // U+0663: "٣" ARABIC-INDIC DIGIT THREE - // U+0662: "٢" ARABIC-INDIC DIGIT TWO - // U+0661: "١" ARABIC-INDIC DIGIT ONE - // U+061F: "؟" ARABIC QUESTION MARK private static final ExpectedKey ARABIC_BACK_TO_SYMBOLS_KEY = key( "\u0663\u0662\u0661\u061F", Constants.CODE_SHIFT); diff --git a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsArabic.java b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsArabic.java index 7c97df5af..fd7670827 100644 --- a/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsArabic.java +++ b/tests/src/com/android/inputmethod/keyboard/layout/tests/TestsArabic.java @@ -25,7 +25,7 @@ import com.android.inputmethod.keyboard.layout.LayoutBase; import java.util.Locale; /** - * ar: TestsArabic/arabic + * ar: Arabic/arabic */ @SmallTest public class TestsArabic extends LayoutTestsBase { diff --git a/tools/make-keyboard-text/res/values-ar/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-ar/donottranslate-more-keys.xml index d9976858a..4bbe343ce 100644 --- a/tools/make-keyboard-text/res/values-ar/donottranslate-more-keys.xml +++ b/tools/make-keyboard-text/res/values-ar/donottranslate-more-keys.xml @@ -19,10 +19,10 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <!-- Label for "switch to alphabetic" key. - U+0623: "ا" ARABIC LETTER ALEF + U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE U+200C: ZERO WIDTH NON-JOINER U+0628: "ب" ARABIC LETTER BEH - U+062C: "پ" ARABIC LETTER PEH --> + U+062C: "ج" ARABIC LETTER JEEM --> <string name="label_to_alpha_key">أ‌ب‌ج</string> <!-- U+0661: "١" ARABIC-INDIC DIGIT ONE --> <string name="keylabel_for_symbols_1">١</string> |