aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-06-14 17:44:53 -0700
committerTadashi G. Takaoka <takaoka@google.com>2012-06-14 17:54:49 -0700
commitff2c9e638722b0259424bc39aa7b7ecc40039dad (patch)
treecac02d6ae803dd63642afb8dfd54b24caaffdfb1
parent7cbd0478cfb66f406bb04c3b5c79da37b2263d66 (diff)
downloadlatinime-ff2c9e638722b0259424bc39aa7b7ecc40039dad.tar.gz
latinime-ff2c9e638722b0259424bc39aa7b7ecc40039dad.tar.xz
latinime-ff2c9e638722b0259424bc39aa7b7ecc40039dad.zip
Fix Persian phone keyboard
Bug: 6670630 Change-Id: I566b9962b4404143a2eb54a39caca4e84962f935
-rw-r--r--java/res/xml-sw600dp/rowkeys_farsi1.xml5
-rw-r--r--java/res/xml/method.xml2
-rw-r--r--java/res/xml/rowkeys_farsi1.xml7
-rw-r--r--java/res/xml/rowkeys_farsi3.xml18
4 files changed, 16 insertions, 16 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="&#x0647;"
- latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;,&#x06C0;,&#x0629;,%" />
+ latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;,&#x0647;&#x0654;,&#x0629;,%" />
<!-- U+062E: "خ" ARABIC LETTER KHAH -->
<Key
latin:keyLabel="&#x062E;" />
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="&#x0635;"
+ latin:moreKeys="&#x0636;,%"
latin:keyHintLabel="1"
latin:additionalMoreKeys="1,&#x06F1;" />
<!-- 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="&#x0647;"
- latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;,&#x06C0;,&#x0629;,%"
+ latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;,&#x0647;&#x0654;,&#x0629;,%"
latin:keyHintLabel="6"
latin:additionalMoreKeys="6,&#x06F6;" />
<!-- 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="&#x0637;"
latin:moreKeys="&#x0638;" />
- <!-- U+0698: "ژ" ARABIC LETTER JEH -->
+ <!-- U+0632: "ز" ARABIC LETTER ZAIN
+ U+0698: "ژ" ARABIC LETTER JEH -->
<Key
- latin:keyLabel="&#x0698;" />
- <!-- U+0632: "ز" ARABIC LETTER ZAIN -->
- <Key
- latin:keyLabel="&#x0632;" />
+ latin:keyLabel="&#x0632;"
+ latin:moreKeys="&#x0698;" />
<!-- U+0631: "ر" ARABIC LETTER REH -->
<Key
latin:keyLabel="&#x0631;" />
- <!-- U+062F: "د" ARABIC LETTER DAL
- U+0630: "ذ" ARABIC LETTER THAL -->
+ <!-- U+0630: "ذ" ARABIC LETTER THAL -->
+ <Key
+ latin:keyLabel="&#x0630;" />
+ <!-- U+062F: "د" ARABIC LETTER DAL -->
<Key
- latin:keyLabel="&#x062F;"
- latin:moreKeys="&#x0630;" />
+ latin:keyLabel="&#x062F;" />
<!-- U+067E: "پ" ARABIC LETTER PEH -->
<Key
latin:keyLabel="&#x067E;" />