am ba0675af: am 0100aef1: Merge "Fix Persian phone keyboard" into jb-dev

* commit 'ba0675afd3e9c5c924b9797a666f1ee86b6c335b':
  Fix Persian phone keyboard
This commit is contained in:
Tadashi G. Takaoka 2012-06-14 20:32:02 -07:00 committed by Android Git Automerger
commit e904bba54b
4 changed files with 16 additions and 16 deletions

View file

@ -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;" />

View file

@ -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

View file

@ -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

View file

@ -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="&#x062F;"
latin:moreKeys="&#x0630;" />
latin:keyLabel="&#x0630;" />
<!-- U+062F: "د" ARABIC LETTER DAL -->
<Key
latin:keyLabel="&#x062F;" />
<!-- U+067E: "پ" ARABIC LETTER PEH -->
<Key
latin:keyLabel="&#x067E;" />