aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/res/xml-v16/key_devanagari_sign_candrabindu.xml3
-rw-r--r--java/res/xml/method.xml2
-rw-r--r--java/res/xml/rowkeys_arabic1.xml12
-rw-r--r--java/res/xml/rowkeys_hindi1.xml4
-rw-r--r--java/res/xml/rowkeys_khmer3.xml2
-rw-r--r--java/res/xml/rowkeys_thai3.xml2
-rw-r--r--java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java8
7 files changed, 16 insertions, 17 deletions
diff --git a/java/res/xml-v16/key_devanagari_sign_candrabindu.xml b/java/res/xml-v16/key_devanagari_sign_candrabindu.xml
index 29f41d143..f24612031 100644
--- a/java/res/xml-v16/key_devanagari_sign_candrabindu.xml
+++ b/java/res/xml-v16/key_devanagari_sign_candrabindu.xml
@@ -29,8 +29,7 @@
<case
latin:keyboardLayoutSet="hindi"
>
- <!-- U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU
- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
+ <!-- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
<key-style
latin:styleName="moreKeysDevanagariSignCandrabindu"
latin:moreKeys="&#x0945;" />
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index 05cb2938b..deef9d13d 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -41,7 +41,7 @@
es_US: Spanish (United States)/spanish
(es_419: Spanish (Latin America)/qwerty)
et_EE: Estonian (Estonia)/nordic
- fa: Persian/arabic
+ fa: Persian/farsi
fi: Finnish/nordic
fr: French/azerty
fr_CA: French (Canada)/qwerty
diff --git a/java/res/xml/rowkeys_arabic1.xml b/java/res/xml/rowkeys_arabic1.xml
index d5f142178..266bba407 100644
--- a/java/res/xml/rowkeys_arabic1.xml
+++ b/java/res/xml/rowkeys_arabic1.xml
@@ -43,8 +43,8 @@
latin:additionalMoreKeys="3,&#x0663;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0642: "ق" ARABIC LETTER QAF
- U+06A8: "ڨ" ARABIC LETTER QAF WITH THREE DOTS ABOVE
- U+0664: "٤" ARABIC-INDIC DIGIT FOUR -->
+ U+0664: "٤" ARABIC-INDIC DIGIT FOUR
+ 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:keySpec="&#x0642;"
@@ -53,10 +53,10 @@
latin:moreKeys="&#x06A8;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0641: "ف" ARABIC LETTER FEH
+ U+0665: "٥" ARABIC-INDIC DIGIT FIVE
U+06A4: "ڤ" ARABIC LETTER VEH
U+06A2: "ڢ" ARABIC LETTER FEH WITH DOT MOVED BELOW
- U+06A5: "ڥ" ARABIC LETTER FEH WITH THREE DOTS BELOW
- U+0665: "٥" ARABIC-INDIC DIGIT FIVE -->
+ 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
@@ -80,9 +80,9 @@
latin:additionalMoreKeys="7,&#x0667;"
latin:keyLabelFlags="fontNormal" />
<!-- U+0647: "ه" ARABIC LETTER HEH
+ U+0668: "٨" ARABIC-INDIC DIGIT EIGHT
U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM
- U+0647 U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER
- U+0668: "٨" ARABIC-INDIC DIGIT EIGHT -->
+ U+0647 U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER -->
<Key
latin:keySpec="&#x0647;"
latin:keyHintLabel="8"
diff --git a/java/res/xml/rowkeys_hindi1.xml b/java/res/xml/rowkeys_hindi1.xml
index 914618a76..5d696b32c 100644
--- a/java/res/xml/rowkeys_hindi1.xml
+++ b/java/res/xml/rowkeys_hindi1.xml
@@ -140,8 +140,8 @@
latin:keyHintLabel="5"
latin:additionalMoreKeys="&#x096B;,5" />
<!-- U+092C: "ब" DEVANAGARI LETTER BA
- U+096C: "६" DEVANAGARI DIGIT SIX
- U+092C/U+0952: "ब॒" DEVANAGARI LETTER BA/DEVANAGARI STRESS SIGN ANUDATTA -->
+ U+092C/U+0952: "ब॒" DEVANAGARI LETTER BA/DEVANAGARI STRESS SIGN ANUDATTA
+ U+096C: "६" DEVANAGARI DIGIT SIX -->
<Key
latin:keySpec="&#x092C;"
latin:moreKeys="&#x092C;&#x0952;,%"
diff --git a/java/res/xml/rowkeys_khmer3.xml b/java/res/xml/rowkeys_khmer3.xml
index 7a2efa7da..5e6d01fb2 100644
--- a/java/res/xml/rowkeys_khmer3.xml
+++ b/java/res/xml/rowkeys_khmer3.xml
@@ -46,7 +46,7 @@
latin:keySpec="&#x17A2;"
latin:keyLabelFlags="fontNormal" />
<!-- U+17C7: "ះ" KHMER SIGN REAHMUK
- U+17C8: "ៈ" KHMER SIGN YUUKALEAPINTU;-->
+ U+17C8: "ៈ" KHMER SIGN YUUKALEAPINTU -->
<Key
latin:keySpec="&#x17C7;"
latin:keyHintLabel="&#x17C8;"
diff --git a/java/res/xml/rowkeys_thai3.xml b/java/res/xml/rowkeys_thai3.xml
index 4af4d232b..098d8a780 100644
--- a/java/res/xml/rowkeys_thai3.xml
+++ b/java/res/xml/rowkeys_thai3.xml
@@ -63,7 +63,7 @@
<Key
latin:keySpec="&#x0E29;"
latin:keyLabelFlags="fontNormal" />
- <!-- U+0E28: "ศ" THAI CHARACTER SO SALA -->
+ <!-- U+0E28: "ศ" THAI CHARACTER SO SALA -->
<Key
latin:keySpec="&#x0E28;"
latin:keyLabelFlags="fontNormal" />
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java
index 387ed3945..7a0161e65 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,
@@ -1567,8 +1567,8 @@ public final class KeyboardTextsTable {
// U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
// U+2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK
// U+203A: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
- /* more_keys_for_less_than */ "!fixedColumnOrder!3,!text/keyspec_left_single_angle_quote;,!text/keyspec_less_than_equal;,!text/keyspec_less_than",
- /* more_keys_for_greater_than */ "!fixedColumnOrder!3,!text/keyspec_right_single_angle_quote;,!text/keyspec_greater_than_equal;,!text/keyspec_greater_than",
+ /* more_keys_for_less_than */ "!fixedColumnOrder!3,!text/keyspec_left_single_angle_quote,!text/keyspec_less_than_equal,!text/keyspec_less_than",
+ /* more_keys_for_greater_than */ "!fixedColumnOrder!3,!text/keyspec_right_single_angle_quote,!text/keyspec_greater_than_equal,!text/keyspec_greater_than",
};
/* Language fi: Finnish */