Use more standard Unicode notations in keyboard layout resource files.
bug: 5988656
Change-Id: Ie2416ccd790f29934a37e9dc77d7525e5113048a
diff --git a/java/res/xml-sw600dp/rows_arabic.xml b/java/res/xml-sw600dp/rows_arabic.xml
index 715ec6c..60ad45e 100644
--- a/java/res/xml-sw600dp/rows_arabic.xml
+++ b/java/res/xml-sw600dp/rows_arabic.xml
@@ -26,53 +26,53 @@
<Row
latin:keyWidth="8.0%p"
>
- <!-- \u0636: "ض" ARABIC LETTER DAD -->
+ <!-- U+0636: "ض" ARABIC LETTER DAD -->
<Key
- latin:keyLabel="\u0636" />
- <!-- \u0635: "ص" ARABIC LETTER SAD -->
+ latin:keyLabel="ض" />
+ <!-- U+0635: "ص" ARABIC LETTER SAD -->
<Key
- latin:keyLabel="\u0635" />
- <!-- \u062b: "ث" ARABIC LETTER THEH -->
+ latin:keyLabel="ص" />
+ <!-- U+062B: "ث" ARABIC LETTER THEH -->
<Key
- latin:keyLabel="\u062b" />
- <!-- \u0642: "ق" ARABIC LETTER QAF
- \u06a8: "ڨ" ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
- <!-- TODO: DroidSansArabic lacks the glyph of \u06a8 ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
+ latin:keyLabel="ث" />
+ <!-- U+0642: "ق" ARABIC LETTER QAF
+ 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:keyLabel="\u0642"
- latin:moreKeys="\u06a8" />
- <!-- \u0641: "ف" ARABIC LETTER FEH
- \u06a4: "ڤ" ARABIC LETTER VEH
- \u06a2: "ڢ" ARABIC LETTER FEH WITH DOT MOVED BELOW
- \u06a5: "ڥ" ARABIC LETTER FEH WITH THREE DOTS BELOW -->
- <!-- TODO: DroidSansArabic lacks the glyph of \u06a2 ARABIC LETTER FEH WITH DOT MOVED BELOW -->
- <!-- TODO: DroidSansArabic lacks the glyph of \u06a5 ARABIC LETTER FEH WITH THREE DOTS BELOW -->
+ latin:keyLabel="ق"
+ latin:moreKeys="ڨ" />
+ <!-- U+0641: "ف" ARABIC LETTER FEH
+ U+06A4: "ڤ" ARABIC LETTER VEH
+ U+06A2: "ڢ" ARABIC LETTER FEH WITH DOT MOVED BELOW
+ 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
- latin:keyLabel="\u0641"
- latin:moreKeys="\u06a4,\u06a2,\u06a5" />
- <!-- \u063a: "غ" ARABIC LETTER GHAIN -->
+ latin:keyLabel="ف"
+ latin:moreKeys="ڤ,ڢ,ڥ" />
+ <!-- U+063A: "غ" ARABIC LETTER GHAIN -->
<Key
- latin:keyLabel="\u063a" />
- <!-- \u0639: "ع" ARABIC LETTER AIN -->
+ latin:keyLabel="غ" />
+ <!-- U+0639: "ع" ARABIC LETTER AIN -->
<Key
- latin:keyLabel="\u0639" />
- <!-- \u0647: "ه" ARABIC LETTER HEH
- \ufeeb: "ﻫ" ARABIC LETTER HEH INITIAL FORM
- \u0647\u200d: ARABIC LETTER HEH + ZERO WIDTH JOINER -->
+ latin:keyLabel="ع" />
+ <!-- U+0647: "ه" ARABIC LETTER HEH
+ U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM
+ U+0647 U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER -->
<Key
- latin:keyLabel="\u0647"
- latin:moreKeys="\ufeeb|\u0647\u200d" />
- <!-- \u062e: "خ" ARABIC LETTER KHAH -->
+ latin:keyLabel="ه"
+ latin:moreKeys="ﻫ|ه‍" />
+ <!-- U+062E: "خ" ARABIC LETTER KHAH -->
<Key
- latin:keyLabel="\u062e" />
- <!-- \u062d: "ح" ARABIC LETTER HAH -->
+ latin:keyLabel="خ" />
+ <!-- U+062D: "ح" ARABIC LETTER HAH -->
<Key
- latin:keyLabel="\u062d" />
- <!-- \u062c: "ج" ARABIC LETTER JEEM
- \u0686: "چ" ARABIC LETTER TCHEH -->
+ latin:keyLabel="ح" />
+ <!-- U+062C: "ج" ARABIC LETTER JEEM
+ U+0686: "چ" ARABIC LETTER TCHEH -->
<Key
- latin:keyLabel="\u062c"
- latin:moreKeys="\u0686" />
+ latin:keyLabel="ج"
+ latin:moreKeys="چ" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
@@ -81,66 +81,66 @@
<Row
latin:keyWidth="8.0%p"
>
- <!-- \u0634: "ش" ARABIC LETTER SHEEN
- \u069c: "ڜ" ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
- <!-- TODO: DroidSansArabic lacks the glyph of \u069c ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
+ <!-- U+0634: "ش" ARABIC LETTER SHEEN
+ U+069C: "ڜ" ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
+ <!-- TODO: DroidSansArabic lacks the glyph of U+069C ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
<Key
- latin:keyLabel="\u0634"
- latin:moreKeys="\u069c"
+ latin:keyLabel="ش"
+ latin:moreKeys="ڜ"
latin:keyXPos="3.0%p" />
- <!-- \u0633: "س" ARABIC LETTER SEEN -->
+ <!-- U+0633: "س" ARABIC LETTER SEEN -->
<Key
- latin:keyLabel="\u0633" />
- <!-- \u064a: "ي" ARABIC LETTER YEH
- \u0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
- \u0649: "ى" ARABIC LETTER ALEF MAKSURA -->
+ latin:keyLabel="س" />
+ <!-- U+064A: "ي" ARABIC LETTER YEH
+ U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
+ U+0649: "ى" ARABIC LETTER ALEF MAKSURA -->
<Key
- latin:keyLabel="\u064a"
- latin:moreKeys="\u0626,\u0649" />
- <!-- \u0628: "ب" ARABIC LETTER BEH
- \u067e: "پ" ARABIC LETTER PEH -->
+ latin:keyLabel="ي"
+ latin:moreKeys="ئ,ى" />
+ <!-- U+0628: "ب" ARABIC LETTER BEH
+ U+067E: "پ" ARABIC LETTER PEH -->
<Key
- latin:keyLabel="\u0628"
- latin:moreKeys="\u067e" />
- <!-- \u0644: "ل" ARABIC LETTER LAM
- \ufefb: "ﻻ" ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
- \u0627: "ا" ARABIC LETTER ALEF
- \ufef7: "ﻷ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM
- \u0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
- \ufef9: "ﻹ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM
- \u0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW
- \ufef5: "ﻵ" ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM
- \u0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
+ latin:keyLabel="ب"
+ latin:moreKeys="پ" />
+ <!-- U+0644: "ل" ARABIC LETTER LAM
+ U+FEFB: "ﻻ" ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
+ U+0627: "ا" ARABIC LETTER ALEF
+ U+FEF7: "ﻷ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM
+ U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
+ U+FEF9: "ﻹ" ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM
+ U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW
+ U+FEF5: "ﻵ" ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM
+ U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
<Key
- latin:keyLabel="\u0644"
- latin:moreKeys="\ufefb|\u0644\u0627,\ufef7|\u0644\u0623,\ufef9|\u0644\u0625,\ufef5|\u0644\u0622" />
- <!-- \u0627: "ا" ARABIC LETTER ALEF
- \u0621: "ء" ARABIC LETTER HAMZA
- \u0671: "ٱ" ARABIC LETTER ALEF WASLA
- \u0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
- \u0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW
- \u0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
+ latin:keyLabel="ل"
+ latin:moreKeys="ﻻ|لا,ﻷ|لأ,ﻹ|لإ,ﻵ|لآ" />
+ <!-- U+0627: "ا" ARABIC LETTER ALEF
+ U+0621: "ء" ARABIC LETTER HAMZA
+ U+0671: "ٱ" ARABIC LETTER ALEF WASLA
+ U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
+ U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW
+ U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
<Key
- latin:keyLabel="\u0627"
- latin:moreKeys="\u0621,\u0671,\u0623,\u0625,\u0622" />
- <!-- \u062a: "ت" ARABIC LETTER TEH -->
+ latin:keyLabel="ا"
+ latin:moreKeys="ء,ٱ,أ,إ,آ" />
+ <!-- U+062A: "ت" ARABIC LETTER TEH -->
<Key
- latin:keyLabel="\u062a" />
- <!-- \u0646: "ن" ARABIC LETTER NOON -->
+ latin:keyLabel="ت" />
+ <!-- U+0646: "ن" ARABIC LETTER NOON -->
<Key
- latin:keyLabel="\u0646" />
- <!-- \u0645: "م" ARABIC LETTER MEEM -->
+ latin:keyLabel="ن" />
+ <!-- U+0645: "م" ARABIC LETTER MEEM -->
<Key
- latin:keyLabel="\u0645" />
- <!-- \u0643: "ك" ARABIC LETTER KAF
- \u06af: "گ" ARABIC LETTER GAF
- \u06a9: "ک" ARABIC LETTER KEHEH -->
+ latin:keyLabel="م" />
+ <!-- U+0643: "ك" ARABIC LETTER KAF
+ U+06AF: "گ" ARABIC LETTER GAF
+ U+06A9: "ک" ARABIC LETTER KEHEH -->
<Key
- latin:keyLabel="\u0643"
- latin:moreKeys="\u06af,\u06a9" />
- <!-- \u0637: "ط" ARABIC LETTER TAH -->
+ latin:keyLabel="ك"
+ latin:moreKeys="گ,ک" />
+ <!-- U+0637: "ط" ARABIC LETTER TAH -->
<Key
- latin:keyLabel="\u0637" />
+ latin:keyLabel="ط" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-14.6%p"
@@ -151,41 +151,41 @@
>
<include
latin:keyboardLayout="@xml/key_smiley" />
- <!-- \u0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE -->
+ <!-- U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE -->
<Key
- latin:keyLabel="\u0626" />
- <!-- \u0621: "ء" ARABIC LETTER HAMZA -->
+ latin:keyLabel="ئ" />
+ <!-- U+0621: "ء" ARABIC LETTER HAMZA -->
<Key
- latin:keyLabel="\u0621" />
- <!-- \u0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
+ latin:keyLabel="ء" />
+ <!-- U+0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
<Key
- latin:keyLabel="\u0624" />
- <!-- \u0631: "ر" ARABIC LETTER REH -->
+ latin:keyLabel="ؤ" />
+ <!-- U+0631: "ر" ARABIC LETTER REH -->
<Key
- latin:keyLabel="\u0631" />
- <!-- \u0630: "ذ" ARABIC LETTER THAL -->
+ latin:keyLabel="ر" />
+ <!-- U+0630: "ذ" ARABIC LETTER THAL -->
<Key
- latin:keyLabel="\u0630" />
- <!-- \u0649: "ى" ARABIC LETTER ALEF MAKSURA -->
+ latin:keyLabel="ذ" />
+ <!-- U+0649: "ى" ARABIC LETTER ALEF MAKSURA -->
<Key
- latin:keyLabel="\u0649" />
- <!-- \u0629: "ة" ARABIC LETTER TEH MARBUTA -->
+ latin:keyLabel="ى" />
+ <!-- U+0629: "ة" ARABIC LETTER TEH MARBUTA -->
<Key
- latin:keyLabel="\u0629" />
- <!-- \u0648: "و" ARABIC LETTER WAW -->
+ latin:keyLabel="ة" />
+ <!-- U+0648: "و" ARABIC LETTER WAW -->
<Key
- latin:keyLabel="\u0648" />
- <!-- \u0632: "ز" ARABIC LETTER ZAIN
- \u0698: "ژ" ARABIC LETTER JEH -->
+ latin:keyLabel="و" />
+ <!-- U+0632: "ز" ARABIC LETTER ZAIN
+ U+0698: "ژ" ARABIC LETTER JEH -->
<Key
- latin:keyLabel="\u0632"
- latin:moreKeys="\u0698" />
- <!-- \u0638: "ظ" ARABIC LETTER ZAH -->
+ latin:keyLabel="ز"
+ latin:moreKeys="ژ" />
+ <!-- U+0638: "ظ" ARABIC LETTER ZAH -->
<Key
- latin:keyLabel="\u0638" />
- <!-- \u062f: "د" ARABIC LETTER DAL -->
+ latin:keyLabel="ظ" />
+ <!-- U+062F: "د" ARABIC LETTER DAL -->
<Key
- latin:keyLabel="\u062f" />
+ latin:keyLabel="د" />
</Row>
<include
latin:keyboardLayout="@xml/row_qwerty4" />