Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d05f36b authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Use normal font for Arabic and Farsi 

Bug: 6753168
Change-Id: Iaef85847cf9f6c432c6ca25e7e6ec522c084d073
parent 666a4338

java/res/xml-sw600dp/rowkeys_arabic1.xml

+22 −11
Original line number Diff line number Diff line
@@ -23,19 +23,23 @@ 
>

    <!-- U+0636: "ض" ARABIC LETTER DAD -->

    <Key

        latin:keyLabel="&#x0636;" />

        latin:keyLabel="&#x0636;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0635: "ص" ARABIC LETTER SAD -->

    <Key

        latin:keyLabel="&#x0635;" />

        latin:keyLabel="&#x0635;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+062B: "ث" ARABIC LETTER THEH -->

    <Key

        latin:keyLabel="&#x062B;" />

        latin:keyLabel="&#x062B;"

        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="&#x0642;"

        latin:moreKeys="&#x06A8;" />

        latin:moreKeys="&#x06A8;"

        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="&#x0641;"

        latin:moreKeys="&#x06A4;,&#x06A2;,&#x06A5;" />

        latin:moreKeys="&#x06A4;,&#x06A2;,&#x06A5;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+063A: "غ" ARABIC LETTER GHAIN -->

    <Key

        latin:keyLabel="&#x063A;" />

        latin:keyLabel="&#x063A;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0639: "ع" ARABIC LETTER AIN -->

    <Key

        latin:keyLabel="&#x0639;" />

        latin:keyLabel="&#x0639;"

        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="&#x0647;"

        latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;" />

        latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+062E: "خ" ARABIC LETTER KHAH -->

    <Key

        latin:keyLabel="&#x062E;" />

        latin:keyLabel="&#x062E;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+062D: "ح" ARABIC LETTER HAH -->

    <Key

        latin:keyLabel="&#x062D;" />

        latin:keyLabel="&#x062D;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+062C: "ج" ARABIC LETTER JEEM

         U+0686: "چ" ARABIC LETTER TCHEH -->

    <Key

        latin:keyLabel="&#x062C;"

        latin:moreKeys="&#x0686;" />

        latin:moreKeys="&#x0686;"

        latin:keyLabelFlags="fontNormal" />

</merge>

java/res/xml-sw600dp/rowkeys_arabic2.xml

+22 −11
Original line number Diff line number Diff line
@@ -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="&#x0634;"

        latin:moreKeys="&#x069C;" />

        latin:moreKeys="&#x069C;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0633: "س" ARABIC LETTER SEEN -->

    <Key

        latin:keyLabel="&#x0633;" />

        latin:keyLabel="&#x0633;"

        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="&#x064A;"

        latin:moreKeys="&#x0626;,&#x0649;" />

        latin:moreKeys="&#x0626;,&#x0649;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0628: "ب" ARABIC LETTER BEH

         U+067E: "پ" ARABIC LETTER PEH -->

    <Key

        latin:keyLabel="&#x0628;"

        latin:moreKeys="&#x067E;" />

        latin:moreKeys="&#x067E;"

        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="&#x0644;"

        latin:moreKeys="&#xFEFB;|&#x0644;&#x0627;,&#xFEF7;|&#x0644;&#x0623;,&#xFEF9;|&#x0644;&#x0625;,&#xFEF5;|&#x0644;&#x0622;" />

        latin:moreKeys="&#xFEFB;|&#x0644;&#x0627;,&#xFEF7;|&#x0644;&#x0623;,&#xFEF9;|&#x0644;&#x0625;,&#xFEF5;|&#x0644;&#x0622;"

        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="&#x0627;"

        latin:moreKeys="&#x0621;,&#x0671;,&#x0623;,&#x0625;,&#x0622;" />

        latin:moreKeys="&#x0621;,&#x0671;,&#x0623;,&#x0625;,&#x0622;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+062A: "ت" ARABIC LETTER TEH -->

    <Key

        latin:keyLabel="&#x062A;" />

        latin:keyLabel="&#x062A;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0646: "ن" ARABIC LETTER NOON -->

    <Key

        latin:keyLabel="&#x0646;" />

        latin:keyLabel="&#x0646;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0645: "م" ARABIC LETTER MEEM -->

    <Key

        latin:keyLabel="&#x0645;" />

        latin:keyLabel="&#x0645;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0643: "ك" ARABIC LETTER KAF

         U+06AF: "گ" ARABIC LETTER GAF

         U+06A9: "ک" ARABIC LETTER KEHEH -->

    <Key

        latin:keyLabel="&#x0643;"

        latin:moreKeys="&#x06AF;,&#x06A9;" />

        latin:moreKeys="&#x06AF;,&#x06A9;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0637: "ط" ARABIC LETTER TAH -->

    <Key

        latin:keyLabel="&#x0637;" />

        latin:keyLabel="&#x0637;"

        latin:keyLabelFlags="fontNormal" />

</merge>

java/res/xml-sw600dp/rowkeys_arabic3.xml

+22 −11
Original line number Diff line number Diff line
@@ -23,37 +23,48 @@ 
>

    <!-- U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE -->

    <Key

        latin:keyLabel="&#x0626;" />

        latin:keyLabel="&#x0626;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0621: "ء" ARABIC LETTER HAMZA -->

    <Key

        latin:keyLabel="&#x0621;" />

        latin:keyLabel="&#x0621;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE -->

    <Key

        latin:keyLabel="&#x0624;" />

        latin:keyLabel="&#x0624;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0631: "ر" ARABIC LETTER REH -->

    <Key

        latin:keyLabel="&#x0631;" />

        latin:keyLabel="&#x0631;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0630: "ذ" ARABIC LETTER THAL -->

    <Key

        latin:keyLabel="&#x0630;" />

        latin:keyLabel="&#x0630;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0649: "ى" ARABIC LETTER ALEF MAKSURA -->

    <Key

        latin:keyLabel="&#x0649;" />

        latin:keyLabel="&#x0649;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0629: "ة" ARABIC LETTER TEH MARBUTA -->

    <Key

        latin:keyLabel="&#x0629;" />

        latin:keyLabel="&#x0629;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0648: "و" ARABIC LETTER WAW -->

    <Key

        latin:keyLabel="&#x0648;" />

        latin:keyLabel="&#x0648;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0632: "ز" ARABIC LETTER ZAIN

         U+0698: "ژ" ARABIC LETTER JEH -->

    <Key

        latin:keyLabel="&#x0632;"

        latin:moreKeys="&#x0698;" />

        latin:moreKeys="&#x0698;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0638: "ظ" ARABIC LETTER ZAH -->

    <Key

        latin:keyLabel="&#x0638;" />

        latin:keyLabel="&#x0638;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+062F: "د" ARABIC LETTER DAL -->

    <Key

        latin:keyLabel="&#x062F;" />

        latin:keyLabel="&#x062F;"

        latin:keyLabelFlags="fontNormal" />

</merge>

java/res/xml-sw600dp/rowkeys_farsi1.xml

+24 −12
Original line number Diff line number Diff line
@@ -23,25 +23,32 @@ 
>

    <!-- U+0636: "ض" ARABIC LETTER DAD -->

    <Key

        latin:keyLabel="&#x0636;" />

        latin:keyLabel="&#x0636;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0635: "ص" ARABIC LETTER SAD -->

    <Key

        latin:keyLabel="&#x0635;" />

        latin:keyLabel="&#x0635;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+062B: "ث" ARABIC LETTER THEH -->

    <Key

        latin:keyLabel="&#x062B;" />

        latin:keyLabel="&#x062B;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0642: "ق" ARABIC LETTER QAF -->

    <Key

        latin:keyLabel="&#x0642;" />

        latin:keyLabel="&#x0642;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0641: "ف" ARABIC LETTER FEH -->

    <Key

        latin:keyLabel="&#x0641;" />

        latin:keyLabel="&#x0641;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+063A: "غ" ARABIC LETTER GHAIN -->

    <Key

        latin:keyLabel="&#x063A;" />

        latin:keyLabel="&#x063A;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0639: "ع" ARABIC LETTER AIN -->

    <Key

        latin:keyLabel="&#x0639;" />

        latin:keyLabel="&#x0639;"

        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="&#x0647;"

        latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;,&#x0647;&#x0654;,&#x0629;,%" />

        latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;,&#x0647;&#x0654;,&#x0629;,%"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+062E: "خ" ARABIC LETTER KHAH -->

    <Key

        latin:keyLabel="&#x062E;" />

        latin:keyLabel="&#x062E;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+062D: "ح" ARABIC LETTER HAH -->

    <Key

        latin:keyLabel="&#x062D;" />

        latin:keyLabel="&#x062D;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+062C: "ج" ARABIC LETTER JEEM -->

    <Key

        latin:keyLabel="&#x062C;" />

        latin:keyLabel="&#x062C;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0686: "چ" ARABIC LETTER TCHEH -->

    <Key

        latin:keyLabel="&#x0686;" />

        latin:keyLabel="&#x0686;"

        latin:keyLabelFlags="fontNormal" />

</merge>

java/res/xml-sw600dp/rowkeys_farsi2.xml

+22 −11
Original line number Diff line number Diff line
@@ -23,10 +23,12 @@ 
>

    <!-- U+0634: "ش" ARABIC LETTER SHEEN -->

    <Key

        latin:keyLabel="&#x0634;" />

        latin:keyLabel="&#x0634;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0633: "س" ARABIC LETTER SEEN -->

    <Key

        latin:keyLabel="&#x0633;" />

        latin:keyLabel="&#x0633;"

        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="&#x06CC;"

        latin:moreKeys="&#x0626;,&#x064A;,&#xFBE8;|&#x0649;" />

        latin:moreKeys="&#x0626;,&#x064A;,&#xFBE8;|&#x0649;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0628: "ب" ARABIC LETTER BEH -->

    <Key

        latin:keyLabel="&#x0628;" />

        latin:keyLabel="&#x0628;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0644: "ل" ARABIC LETTER LAM -->

    <Key

        latin:keyLabel="&#x0644;" />

        latin:keyLabel="&#x0644;"

        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="&#x0627;"

        latin:moreKeys="&#x0621;,&#x0622;,&#x0623;,&#x0671;,&#x0625;" />

        latin:moreKeys="&#x0621;,&#x0622;,&#x0623;,&#x0671;,&#x0625;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+062A: "ت" ARABIC LETTER TEH

         U+062B: "ﺙ" ARABIC LETTER THEH

         U+0629: "ة": ARABIC LETTER TEH MARBUTA -->

    <Key

        latin:keyLabel="&#x062A;"

        latin:moreKeys="&#x062B;,&#x0629;" />

        latin:moreKeys="&#x062B;,&#x0629;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0646: "ن" ARABIC LETTER NOON -->

    <Key

        latin:keyLabel="&#x0646;" />

        latin:keyLabel="&#x0646;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+0645: "م" ARABIC LETTER MEEM -->

    <Key

        latin:keyLabel="&#x0645;" />

        latin:keyLabel="&#x0645;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+06A9: "ک" ARABIC LETTER KEHEH

         U+0643: "ك" ARABIC LETTER KAF -->

    <Key

        latin:keyLabel="&#x06A9;"

        latin:moreKeys="&#x0643;" />

        latin:moreKeys="&#x0643;"

        latin:keyLabelFlags="fontNormal" />

    <!-- U+06AF: "گ" ARABIC LETTER GAF -->

    <Key

        latin:keyLabel="&#x06AF;" />

        latin:keyLabel="&#x06AF;"

        latin:keyLabelFlags="fontNormal" />

</merge>