Use normal font for Arabic and Farsi
Bug: 6753168
Change-Id: Iaef85847cf9f6c432c6ca25e7e6ec522c084d073
diff --git a/java/res/xml-sw600dp/rowkeys_arabic1.xml b/java/res/xml-sw600dp/rowkeys_arabic1.xml
index 44fdc67..6a0e257 100644
--- a/java/res/xml-sw600dp/rowkeys_arabic1.xml
+++ b/java/res/xml-sw600dp/rowkeys_arabic1.xml
@@ -23,19 +23,23 @@
>
<!-- U+0636: "ض" ARABIC LETTER DAD -->
<Key
- latin:keyLabel="ض" />
+ latin:keyLabel="ض"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0635: "ص" ARABIC LETTER SAD -->
<Key
- latin:keyLabel="ص" />
+ latin:keyLabel="ص"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+062B: "ث" ARABIC LETTER THEH -->
<Key
- latin:keyLabel="ث" />
+ latin:keyLabel="ث"
+ latin:keyLabelFlags="fontNormal" />
<!-- 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="ق"
- latin:moreKeys="ڨ" />
+ latin:moreKeys="ڨ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0641: "ف" ARABIC LETTER FEH
U+06A4: "ڤ" ARABIC LETTER VEH
U+06A2: "ڢ" ARABIC LETTER FEH WITH DOT MOVED BELOW
@@ -44,28 +48,35 @@
<!-- TODO: DroidSansArabic lacks the glyph of U+06A5 ARABIC LETTER FEH WITH THREE DOTS BELOW -->
<Key
latin:keyLabel="ف"
- latin:moreKeys="ڤ,ڢ,ڥ" />
+ latin:moreKeys="ڤ,ڢ,ڥ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+063A: "غ" ARABIC LETTER GHAIN -->
<Key
- latin:keyLabel="غ" />
+ latin:keyLabel="غ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0639: "ع" ARABIC LETTER AIN -->
<Key
- latin:keyLabel="ع" />
+ latin:keyLabel="ع"
+ latin:keyLabelFlags="fontNormal" />
<!-- 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="ه"
- latin:moreKeys="ﻫ|ه‍" />
+ latin:moreKeys="ﻫ|ه‍"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+062E: "خ" ARABIC LETTER KHAH -->
<Key
- latin:keyLabel="خ" />
+ latin:keyLabel="خ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+062D: "ح" ARABIC LETTER HAH -->
<Key
- latin:keyLabel="ح" />
+ latin:keyLabel="ح"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+062C: "ج" ARABIC LETTER JEEM
U+0686: "چ" ARABIC LETTER TCHEH -->
<Key
latin:keyLabel="ج"
- latin:moreKeys="چ" />
+ latin:moreKeys="چ"
+ latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml-sw600dp/rowkeys_arabic2.xml b/java/res/xml-sw600dp/rowkeys_arabic2.xml
index 3eba2fb..00e69ac 100644
--- a/java/res/xml-sw600dp/rowkeys_arabic2.xml
+++ b/java/res/xml-sw600dp/rowkeys_arabic2.xml
@@ -26,21 +26,25 @@
<!-- TODO: DroidSansArabic lacks the glyph of U+069C ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
<Key
latin:keyLabel="ش"
- latin:moreKeys="ڜ" />
+ latin:moreKeys="ڜ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0633: "س" ARABIC LETTER SEEN -->
<Key
- latin:keyLabel="س" />
+ latin:keyLabel="س"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+064A: "ي" ARABIC LETTER YEH
U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
U+0649: "ى" ARABIC LETTER ALEF MAKSURA -->
<Key
latin:keyLabel="ي"
- latin:moreKeys="ئ,ى" />
+ latin:moreKeys="ئ,ى"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0628: "ب" ARABIC LETTER BEH
U+067E: "پ" ARABIC LETTER PEH -->
<Key
latin:keyLabel="ب"
- latin:moreKeys="پ" />
+ latin:moreKeys="پ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0644: "ل" ARABIC LETTER LAM
U+FEFB: "ﻻ" ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
U+0627: "ا" ARABIC LETTER ALEF
@@ -52,7 +56,8 @@
U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
<Key
latin:keyLabel="ل"
- latin:moreKeys="ﻻ|لا,ﻷ|لأ,ﻹ|لإ,ﻵ|لآ" />
+ latin:moreKeys="ﻻ|لا,ﻷ|لأ,ﻹ|لإ,ﻵ|لآ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0627: "ا" ARABIC LETTER ALEF
U+0621: "ء" ARABIC LETTER HAMZA
U+0671: "ٱ" ARABIC LETTER ALEF WASLA
@@ -61,23 +66,29 @@
U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
<Key
latin:keyLabel="ا"
- latin:moreKeys="ء,ٱ,أ,إ,آ" />
+ latin:moreKeys="ء,ٱ,أ,إ,آ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+062A: "ت" ARABIC LETTER TEH -->
<Key
- latin:keyLabel="ت" />
+ latin:keyLabel="ت"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0646: "ن" ARABIC LETTER NOON -->
<Key
- latin:keyLabel="ن" />
+ latin:keyLabel="ن"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0645: "م" ARABIC LETTER MEEM -->
<Key
- latin:keyLabel="م" />
+ latin:keyLabel="م"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0643: "ك" ARABIC LETTER KAF
U+06AF: "گ" ARABIC LETTER GAF
U+06A9: "ک" ARABIC LETTER KEHEH -->
<Key
latin:keyLabel="ك"
- latin:moreKeys="گ,ک" />
+ latin:moreKeys="گ,ک"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0637: "ط" ARABIC LETTER TAH -->
<Key
- latin:keyLabel="ط" />
+ latin:keyLabel="ط"
+ latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml-sw600dp/rowkeys_arabic3.xml b/java/res/xml-sw600dp/rowkeys_arabic3.xml
index 911550f..b0bcd78 100644
--- a/java/res/xml-sw600dp/rowkeys_arabic3.xml
+++ b/java/res/xml-sw600dp/rowkeys_arabic3.xml
@@ -23,37 +23,48 @@
>
<!-- U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE -->
<Key
- latin:keyLabel="ئ" />
+ latin:keyLabel="ئ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0621: "ء" ARABIC LETTER HAMZA -->
<Key
- latin:keyLabel="ء" />
+ latin:keyLabel="ء"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
<Key
- latin:keyLabel="ؤ" />
+ latin:keyLabel="ؤ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0631: "ر" ARABIC LETTER REH -->
<Key
- latin:keyLabel="ر" />
+ latin:keyLabel="ر"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0630: "ذ" ARABIC LETTER THAL -->
<Key
- latin:keyLabel="ذ" />
+ latin:keyLabel="ذ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0649: "ى" ARABIC LETTER ALEF MAKSURA -->
<Key
- latin:keyLabel="ى" />
+ latin:keyLabel="ى"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0629: "ة" ARABIC LETTER TEH MARBUTA -->
<Key
- latin:keyLabel="ة" />
+ latin:keyLabel="ة"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0648: "و" ARABIC LETTER WAW -->
<Key
- latin:keyLabel="و" />
+ latin:keyLabel="و"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0632: "ز" ARABIC LETTER ZAIN
U+0698: "ژ" ARABIC LETTER JEH -->
<Key
latin:keyLabel="ز"
- latin:moreKeys="ژ" />
+ latin:moreKeys="ژ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0638: "ظ" ARABIC LETTER ZAH -->
<Key
- latin:keyLabel="ظ" />
+ latin:keyLabel="ظ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+062F: "د" ARABIC LETTER DAL -->
<Key
- latin:keyLabel="د" />
+ latin:keyLabel="د"
+ latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml-sw600dp/rowkeys_farsi1.xml b/java/res/xml-sw600dp/rowkeys_farsi1.xml
index 53208f2..7b31240 100644
--- a/java/res/xml-sw600dp/rowkeys_farsi1.xml
+++ b/java/res/xml-sw600dp/rowkeys_farsi1.xml
@@ -23,25 +23,32 @@
>
<!-- U+0636: "ض" ARABIC LETTER DAD -->
<Key
- latin:keyLabel="ض" />
+ latin:keyLabel="ض"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0635: "ص" ARABIC LETTER SAD -->
<Key
- latin:keyLabel="ص" />
+ latin:keyLabel="ص"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+062B: "ث" ARABIC LETTER THEH -->
<Key
- latin:keyLabel="ث" />
+ latin:keyLabel="ث"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0642: "ق" ARABIC LETTER QAF -->
<Key
- latin:keyLabel="ق" />
+ latin:keyLabel="ق"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0641: "ف" ARABIC LETTER FEH -->
<Key
- latin:keyLabel="ف" />
+ latin:keyLabel="ف"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+063A: "غ" ARABIC LETTER GHAIN -->
<Key
- latin:keyLabel="غ" />
+ latin:keyLabel="غ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0639: "ع" ARABIC LETTER AIN -->
<Key
- latin:keyLabel="ع" />
+ latin:keyLabel="ع"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0647: "ه" ARABIC LETTER HEH
U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM
U+0647/U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER
@@ -49,17 +56,22 @@
U+0629: "ة" ARABIC LETTER TEH MARBUTA -->
<Key
latin:keyLabel="ه"
- latin:moreKeys="ﻫ|ه‍,هٔ,ة,%" />
+ latin:moreKeys="ﻫ|ه‍,هٔ,ة,%"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+062E: "خ" ARABIC LETTER KHAH -->
<Key
- latin:keyLabel="خ" />
+ latin:keyLabel="خ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+062D: "ح" ARABIC LETTER HAH -->
<Key
- latin:keyLabel="ح" />
+ latin:keyLabel="ح"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+062C: "ج" ARABIC LETTER JEEM -->
<Key
- latin:keyLabel="ج" />
+ latin:keyLabel="ج"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0686: "چ" ARABIC LETTER TCHEH -->
<Key
- latin:keyLabel="چ" />
+ latin:keyLabel="چ"
+ latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml-sw600dp/rowkeys_farsi2.xml b/java/res/xml-sw600dp/rowkeys_farsi2.xml
index 234f984..3b759b6 100644
--- a/java/res/xml-sw600dp/rowkeys_farsi2.xml
+++ b/java/res/xml-sw600dp/rowkeys_farsi2.xml
@@ -23,10 +23,12 @@
>
<!-- U+0634: "ش" ARABIC LETTER SHEEN -->
<Key
- latin:keyLabel="ش" />
+ latin:keyLabel="ش"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0633: "س" ARABIC LETTER SEEN -->
<Key
- latin:keyLabel="س" />
+ latin:keyLabel="س"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+06CC: "ی" ARABIC LETTER FARSI YEH
U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
U+064A: "ي" ARABIC LETTER YEH
@@ -34,13 +36,16 @@
U+0649: "ى" ARABIC LETTER ALEF MAKSURA -->
<Key
latin:keyLabel="ی"
- latin:moreKeys="ئ,ي,ﯨ|ى" />
+ latin:moreKeys="ئ,ي,ﯨ|ى"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0628: "ب" ARABIC LETTER BEH -->
<Key
- latin:keyLabel="ب" />
+ latin:keyLabel="ب"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0644: "ل" ARABIC LETTER LAM -->
<Key
- latin:keyLabel="ل" />
+ latin:keyLabel="ل"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0627: "ا" ARABIC LETTER ALEF
U+0621: "ء" ARABIC LETTER HAMZA
U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE
@@ -49,25 +54,31 @@
U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW -->
<Key
latin:keyLabel="ا"
- latin:moreKeys="ء,آ,أ,ٱ,إ" />
+ latin:moreKeys="ء,آ,أ,ٱ,إ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+062A: "ت" ARABIC LETTER TEH
U+062B: "ﺙ" ARABIC LETTER THEH
U+0629: "ة": ARABIC LETTER TEH MARBUTA -->
<Key
latin:keyLabel="ت"
- latin:moreKeys="ث,ة" />
+ latin:moreKeys="ث,ة"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0646: "ن" ARABIC LETTER NOON -->
<Key
- latin:keyLabel="ن" />
+ latin:keyLabel="ن"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0645: "م" ARABIC LETTER MEEM -->
<Key
- latin:keyLabel="م" />
+ latin:keyLabel="م"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+06A9: "ک" ARABIC LETTER KEHEH
U+0643: "ك" ARABIC LETTER KAF -->
<Key
latin:keyLabel="ک"
- latin:moreKeys="ك" />
+ latin:moreKeys="ك"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+06AF: "گ" ARABIC LETTER GAF -->
<Key
- latin:keyLabel="گ" />
+ latin:keyLabel="گ"
+ latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml-sw600dp/rowkeys_farsi3.xml b/java/res/xml-sw600dp/rowkeys_farsi3.xml
index 998ba72..3597618 100644
--- a/java/res/xml-sw600dp/rowkeys_farsi3.xml
+++ b/java/res/xml-sw600dp/rowkeys_farsi3.xml
@@ -23,34 +23,44 @@
>
<!-- U+0638: "ظ" ARABIC LETTER ZAH -->
<Key
- latin:keyLabel="ظ" />
+ latin:keyLabel="ظ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0637: "ط" ARABIC LETTER TAH -->
<Key
- latin:keyLabel="ط" />
+ latin:keyLabel="ط"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0698: "ژ" ARABIC LETTER JEH -->
<Key
- latin:keyLabel="ژ" />
+ latin:keyLabel="ژ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0632: "ز" ARABIC LETTER ZAIN -->
<Key
- latin:keyLabel="ز" />
+ latin:keyLabel="ز"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0631: "ر" ARABIC LETTER REH -->
<Key
- latin:keyLabel="ر" />
+ latin:keyLabel="ر"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0630: "ذ" ARABIC LETTER THAL -->
<Key
- latin:keyLabel="ذ" />
+ latin:keyLabel="ذ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+062F: "د" ARABIC LETTER DAL -->
<Key
- latin:keyLabel="د" />
+ latin:keyLabel="د"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+067E: "پ" ARABIC LETTER PEH -->
<Key
- latin:keyLabel="پ" />
+ latin:keyLabel="پ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0648: "و" ARABIC LETTER WAW
U+0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
<Key
latin:keyLabel="و"
- latin:moreKeys="ؤ" />
+ latin:moreKeys="ؤ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
<Key
- latin:keyLabel="آ" />
+ latin:keyLabel="آ"
+ latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml/kbd_arabic.xml b/java/res/xml/kbd_arabic.xml
index e3b90b0..ce5f30b 100644
--- a/java/res/xml/kbd_arabic.xml
+++ b/java/res/xml/kbd_arabic.xml
@@ -20,7 +20,6 @@
<Keyboard
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyTypeface="normal"
>
<include
latin:keyboardLayout="@xml/rows_arabic" />
diff --git a/java/res/xml/rowkeys_arabic1.xml b/java/res/xml/rowkeys_arabic1.xml
index b1bf790..a4bef83 100644
--- a/java/res/xml/rowkeys_arabic1.xml
+++ b/java/res/xml/rowkeys_arabic1.xml
@@ -26,13 +26,15 @@
<Key
latin:keyLabel="ض"
latin:keyHintLabel="1"
- latin:additionalMoreKeys="1,١" />
+ latin:additionalMoreKeys="1,١"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0635: "ص" ARABIC LETTER SAD
U+0662: "٢" ARABIC-INDIC DIGIT TWO -->
<Key
latin:keyLabel="ص"
latin:keyHintLabel="2"
- latin:additionalMoreKeys="2,٢" />
+ latin:additionalMoreKeys="2,٢"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0642: "ق" ARABIC LETTER QAF
U+06A8: "ڨ" ARABIC LETTER QAF WITH THREE DOTS ABOVE
U+0663: "٣" ARABIC-INDIC DIGIT THREE -->
@@ -41,7 +43,8 @@
latin:keyLabel="ق"
latin:keyHintLabel="3"
latin:additionalMoreKeys="3,٣"
- latin:moreKeys="ڨ" />
+ latin:moreKeys="ڨ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0641: "ف" ARABIC LETTER FEH
U+06A4: "ڤ" ARABIC LETTER VEH
U+06A2: "ڢ" ARABIC LETTER FEH WITH DOT MOVED BELOW
@@ -53,19 +56,22 @@
latin:keyLabel="ف"
latin:keyHintLabel="4"
latin:additionalMoreKeys="4,٤"
- latin:moreKeys="ڤ,ڢ,ڥ" />
+ latin:moreKeys="ڤ,ڢ,ڥ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+063A: "غ" ARABIC LETTER GHAIN
U+0665: "٥" ARABIC-INDIC DIGIT FIVE -->
<Key
latin:keyLabel="غ"
latin:keyHintLabel="5"
- latin:additionalMoreKeys="5,٥" />
+ latin:additionalMoreKeys="5,٥"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0639: "ع" ARABIC LETTER AIN
U+0666: "٦" ARABIC-INDIC DIGIT SIX -->
<Key
latin:keyLabel="ع"
latin:keyHintLabel="6"
- latin:additionalMoreKeys="6,٦" />
+ latin:additionalMoreKeys="6,٦"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0647: "ه" ARABIC LETTER HEH
U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM
U+0647 U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER
@@ -74,19 +80,22 @@
latin:keyLabel="ه"
latin:keyHintLabel="7"
latin:additionalMoreKeys="7,٧"
- latin:moreKeys="ﻫ|ه‍" />
+ latin:moreKeys="ﻫ|ه‍"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+062E: "خ" ARABIC LETTER KHAH
U+0668: "٨" ARABIC-INDIC DIGIT EIGHT -->
<Key
latin:keyLabel="خ"
latin:keyHintLabel="8"
- latin:additionalMoreKeys="8,٨" />
+ latin:additionalMoreKeys="8,٨"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+062D: "ح" ARABIC LETTER HAH
U+0669: "٩" ARABIC-INDIC DIGIT NINE -->
<Key
latin:keyLabel="ح"
latin:keyHintLabel="9"
- latin:additionalMoreKeys="9,٩" />
+ latin:additionalMoreKeys="9,٩"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+062C: "ج" ARABIC LETTER JEEM
U+0686: "چ" ARABIC LETTER TCHEH
U+0660: "٠" ARABIC-INDIC DIGIT ZERO -->
@@ -94,5 +103,6 @@
latin:keyLabel="ج"
latin:keyHintLabel="0"
latin:additionalMoreKeys="0,٠"
- latin:moreKeys="چ" />
+ latin:moreKeys="چ"
+ latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml/rowkeys_arabic2.xml b/java/res/xml/rowkeys_arabic2.xml
index f86aae0..d733f64 100644
--- a/java/res/xml/rowkeys_arabic2.xml
+++ b/java/res/xml/rowkeys_arabic2.xml
@@ -26,21 +26,25 @@
<!-- TODO: DroidSansArabic lacks the glyph of U+069C ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
<Key
latin:keyLabel="ش"
- latin:moreKeys="ڜ" />
+ latin:moreKeys="ڜ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0633: "س" ARABIC LETTER SEEN -->
<Key
- latin:keyLabel="س" />
+ latin:keyLabel="س"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+064A: "ي" ARABIC LETTER YEH
U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
U+0649: "ى" ARABIC LETTER ALEF MAKSURA -->
<Key
latin:keyLabel="ي"
- latin:moreKeys="ئ,ى" />
+ latin:moreKeys="ئ,ى"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0628: "ب" ARABIC LETTER BEH
U+067E: "پ" ARABIC LETTER PEH -->
<Key
latin:keyLabel="ب"
- latin:moreKeys="پ" />
+ latin:moreKeys="پ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0644: "ل" ARABIC LETTER LAM
U+FEFB: "ﻻ" ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
U+0627: "ا" ARABIC LETTER ALEF
@@ -52,7 +56,8 @@
U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
<Key
latin:keyLabel="ل"
- latin:moreKeys="ﻻ|لا,ﻷ|لأ,ﻹ|لإ,ﻵ|لآ" />
+ latin:moreKeys="ﻻ|لا,ﻷ|لأ,ﻹ|لإ,ﻵ|لآ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0627: "ا" ARABIC LETTER ALEF
U+0621: "ء" ARABIC LETTER HAMZA
U+0671: "ٱ" ARABIC LETTER ALEF WASLA
@@ -61,23 +66,27 @@
U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
<Key
latin:keyLabel="ا"
- latin:moreKeys="ء,ٱ,أ,إ,آ" />
+ latin:moreKeys="ء,ٱ,أ,إ,آ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+062A: "ت" ARABIC LETTER TEH
U+062B: "ﺙ" ARABIC LETTER THEH -->
<Key
latin:keyLabel="ت"
- latin:moreKeys="ث" />
+ latin:moreKeys="ث"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0646: "ن" ARABIC LETTER NOON -->
<Key
- latin:keyLabel="ن" />
+ latin:keyLabel="ن"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0645: "م" ARABIC LETTER MEEM -->
<Key
- latin:keyLabel="م" />
+ latin:keyLabel="م"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0643: "ك" ARABIC LETTER KAF
U+06AF: "گ" ARABIC LETTER GAF
U+06A9: "ک" ARABIC LETTER KEHEH -->
<Key
latin:keyLabel="ك"
latin:moreKeys="گ,ک"
- latin:keyWidth="fillRight" />
+ latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml/rowkeys_arabic3.xml b/java/res/xml/rowkeys_arabic3.xml
index 9e9eac0..e4e6948 100644
--- a/java/res/xml/rowkeys_arabic3.xml
+++ b/java/res/xml/rowkeys_arabic3.xml
@@ -23,30 +23,38 @@
>
<!-- U+0638: "ظ" ARABIC LETTER ZAH -->
<Key
- latin:keyLabel="ظ" />
+ latin:keyLabel="ظ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0637: "ط" ARABIC LETTER TAH -->
<Key
- latin:keyLabel="ط" />
+ latin:keyLabel="ط"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0630: "ذ" ARABIC LETTER THAL -->
<Key
- latin:keyLabel="ذ" />
+ latin:keyLabel="ذ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+062F: "د" ARABIC LETTER DAL -->
<Key
- latin:keyLabel="د" />
+ latin:keyLabel="د"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0632: "ز" ARABIC LETTER ZAIN
U+0698: "ژ" ARABIC LETTER JEH -->
<Key
latin:keyLabel="ز"
- latin:moreKeys="ژ" />
+ latin:moreKeys="ژ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0631: "ر" ARABIC LETTER REH -->
<Key
- latin:keyLabel="ر" />
+ latin:keyLabel="ر"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0629: "ة" ARABIC LETTER TEH MARBUTA -->
<Key
- latin:keyLabel="ة" />
+ latin:keyLabel="ة"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0648: "و" ARABIC LETTER WAW
U+0624: "ﺅ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
<Key
latin:keyLabel="و"
- latin:moreKeys="ؤ" />
+ latin:moreKeys="ؤ"
+ latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml/rowkeys_farsi1.xml b/java/res/xml/rowkeys_farsi1.xml
index 840b048..0ccf1ab 100644
--- a/java/res/xml/rowkeys_farsi1.xml
+++ b/java/res/xml/rowkeys_farsi1.xml
@@ -28,31 +28,36 @@
latin:keyLabel="ص"
latin:moreKeys="ض,%"
latin:keyHintLabel="۱"
- latin:additionalMoreKeys="۱,1" />
+ latin:additionalMoreKeys="۱,1"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0642: "ق" ARABIC LETTER QAF
U+06F2: "۲" EXTENDED ARABIC-INDIC DIGIT TWO -->
<Key
latin:keyLabel="ق"
latin:keyHintLabel="۲"
- latin:additionalMoreKeys="۲,2" />
+ latin:additionalMoreKeys="۲,2"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0641: "ف" ARABIC LETTER FEH
U+06F3: "۳" EXTENDED ARABIC-INDIC DIGIT THREE -->
<Key
latin:keyLabel="ف"
latin:keyHintLabel="۳"
- latin:additionalMoreKeys="۳,3" />
+ latin:additionalMoreKeys="۳,3"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+063A: "غ" ARABIC LETTER GHAIN
U+06F4: "۴" EXTENDED ARABIC-INDIC DIGIT FOUR -->
<Key
latin:keyLabel="غ"
latin:keyHintLabel="۴"
- latin:additionalMoreKeys="۴,4" />
+ latin:additionalMoreKeys="۴,4"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0639: "ع" ARABIC LETTER AIN
U+06F5: "۵" EXTENDED ARABIC-INDIC DIGIT FIVE -->
<Key
latin:keyLabel="ع"
latin:keyHintLabel="۵"
- latin:additionalMoreKeys="۵,5" />
+ latin:additionalMoreKeys="۵,5"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0647: "ه" ARABIC LETTER HEH
U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM
U+0647/U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER
@@ -63,29 +68,34 @@
latin:keyLabel="ه"
latin:moreKeys="ﻫ|ه‍,هٔ,ة,%"
latin:keyHintLabel="۶"
- latin:additionalMoreKeys="۶,6" />
+ latin:additionalMoreKeys="۶,6"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+062E: "خ" ARABIC LETTER KHAH
U+06F7: "۷" EXTENDED ARABIC-INDIC DIGIT SEVEN -->
<Key
latin:keyLabel="خ"
latin:keyHintLabel="۷"
- latin:additionalMoreKeys="۷,7" />
+ latin:additionalMoreKeys="۷,7"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+062D: "ح" ARABIC LETTER HAH
U+06F8: "۸" EXTENDED ARABIC-INDIC DIGIT EIGHT -->
<Key
latin:keyLabel="ح"
latin:keyHintLabel="۸"
- latin:additionalMoreKeys="۸,8" />
+ latin:additionalMoreKeys="۸,8"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+062C: "ج" ARABIC LETTER JEEM
U+06F9: "۹" EXTENDED ARABIC-INDIC DIGIT NINE -->
<Key
latin:keyLabel="ج"
latin:keyHintLabel="۹"
- latin:additionalMoreKeys="۹,9" />
+ latin:additionalMoreKeys="۹,9"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0686: "چ" ARABIC LETTER TCHEH
U+06F0: "۰" EXTENDED ARABIC-INDIC DIGIT ZERO -->
<Key
latin:keyLabel="چ"
latin:keyHintLabel="۰"
- latin:additionalMoreKeys="۰,0" />
+ latin:additionalMoreKeys="۰,0"
+ latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml/rowkeys_farsi2.xml b/java/res/xml/rowkeys_farsi2.xml
index 2154893..4b6abe2 100644
--- a/java/res/xml/rowkeys_farsi2.xml
+++ b/java/res/xml/rowkeys_farsi2.xml
@@ -23,12 +23,14 @@
>
<!-- U+0634: "ش" ARABIC LETTER SHEEN -->
<Key
- latin:keyLabel="ش" />
+ latin:keyLabel="ش"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0633: "س" ARABIC LETTER SEEN
U+0636: "ض" ARABIC LETTER DAD -->
<Key
latin:keyLabel="س"
- latin:moreKeys="ض" />
+ latin:moreKeys="ض"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+06CC: "ی" ARABIC LETTER FARSI YEH
U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
U+064A: "ي" ARABIC LETTER YEH
@@ -36,13 +38,16 @@
U+0649: "ى" ARABIC LETTER ALEF MAKSURA -->
<Key
latin:keyLabel="ی"
- latin:moreKeys="ئ,ي,ﯨ|ى" />
+ latin:moreKeys="ئ,ي,ﯨ|ى"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0628: "ب" ARABIC LETTER BEH -->
<Key
- latin:keyLabel="ب" />
+ latin:keyLabel="ب"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0644: "ل" ARABIC LETTER LAM -->
<Key
- latin:keyLabel="ل" />
+ latin:keyLabel="ل"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0627: "ا" ARABIC LETTER ALEF
U+0621: "ء" ARABIC LETTER HAMZA
U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE
@@ -51,22 +56,27 @@
U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW -->
<Key
latin:keyLabel="ا"
- latin:moreKeys="ء,آ,أ,ٱ,إ" />
+ latin:moreKeys="ء,آ,أ,ٱ,إ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+062A: "ت" ARABIC LETTER TEH
U+062B: "ﺙ" ARABIC LETTER THEH
U+0629: "ة": ARABIC LETTER TEH MARBUTA -->
<Key
latin:keyLabel="ت"
- latin:moreKeys="ث,ة" />
+ latin:moreKeys="ث,ة"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0646: "ن" ARABIC LETTER NOON -->
<Key
- latin:keyLabel="ن" />
+ latin:keyLabel="ن"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0645: "م" ARABIC LETTER MEEM -->
<Key
- latin:keyLabel="م" />
+ latin:keyLabel="م"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+06A9: "ک" ARABIC LETTER KEHEH
U+0643: "ك" ARABIC LETTER KAF -->
<Key
latin:keyLabel="ک"
- latin:moreKeys="ك" />
+ latin:moreKeys="ك"
+ latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml/rowkeys_farsi3.xml b/java/res/xml/rowkeys_farsi3.xml
index 29c3513..7d2e81f 100644
--- a/java/res/xml/rowkeys_farsi3.xml
+++ b/java/res/xml/rowkeys_farsi3.xml
@@ -25,30 +25,38 @@
U+0638: "ظ" ARABIC LETTER ZAH -->
<Key
latin:keyLabel="ط"
- latin:moreKeys="ظ" />
+ latin:moreKeys="ظ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0632: "ز" ARABIC LETTER ZAIN
U+0698: "ژ" ARABIC LETTER JEH -->
<Key
latin:keyLabel="ز"
- latin:moreKeys="ژ" />
+ latin:moreKeys="ژ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0631: "ر" ARABIC LETTER REH -->
<Key
- latin:keyLabel="ر" />
+ latin:keyLabel="ر"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0630: "ذ" ARABIC LETTER THAL -->
<Key
- latin:keyLabel="ذ" />
+ latin:keyLabel="ذ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+062F: "د" ARABIC LETTER DAL -->
<Key
- latin:keyLabel="د" />
+ latin:keyLabel="د"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+067E: "پ" ARABIC LETTER PEH -->
<Key
- latin:keyLabel="پ" />
+ latin:keyLabel="پ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+0648: "و" ARABIC LETTER WAW
U+0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
<Key
latin:keyLabel="و"
- latin:moreKeys="ؤ" />
+ latin:moreKeys="ؤ"
+ latin:keyLabelFlags="fontNormal" />
<!-- U+06AF: "گ" ARABIC LETTER GAF -->
<Key
- latin:keyLabel="گ" />
+ latin:keyLabel="گ"
+ latin:keyLabelFlags="fontNormal" />
</merge>