From 538abc27dc365fb4d7799ab7f61523a92040a236 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Mon, 17 Mar 2014 11:56:13 +0900
Subject: [PATCH] Fix Arabic keyboard text and test comments
Bug: 13017434
Change-Id: Iec2ddab719e0c68a70bcf56a90eb4522c5fd7978
---
.../inputmethod/keyboard/internal/KeyboardTextsTable.java | 4 ++--
.../com/android/inputmethod/keyboard/layout/Arabic.java | 8 ++------
.../inputmethod/keyboard/layout/tests/TestsArabic.java | 2 +-
.../res/values-ar/donottranslate-more-keys.xml | 4 ++--
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 387ed3945d..e056a26016 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 65b050be73..6fbede8a7b 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 7c97df5af8..fd76708278 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 d9976858a9..4bbe343ce8 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>
--
GitLab