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

Commit c380959f authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android Git Automerger
Browse files

am bbf18807: am 1db4f951: Fix the order of Persian diacritics 

* commit 'bbf18807':
  Fix the order of Persian diacritics
parents 1738be86 bbf18807

java/res/xml-sw600dp/key_dash.xml

+1 −2
Original line number Diff line number Diff line
@@ -31,10 +31,9 @@ 
        <case

            latin:languageCode="ar|fa"

        >

            <!-- U+064B: "ً" ARABIC FATHATAN -->

            <Key

                latin:keyLabel="."

                latin:keyHintLabel="&#x064B;"

                latin:keyHintLabel="!text/keyhintlabel_for_arabic_diacritics"

                latin:moreKeys="!text/more_keys_for_arabic_diacritics"

                latin:keyStyle="hasShiftedLetterHintStyle" />

        </case>

java/res/xml/row_qwerty4.xml

+1 −2
Original line number Diff line number Diff line
@@ -36,9 +36,8 @@ 
            <case

                latin:languageCode="ar|fa"

            >

                <!-- U+064B: "ً" ARABIC FATHATAN -->

                <Key

                    latin:keyHintLabel="&#x064B;"

                    latin:keyHintLabel="!text/keyhintlabel_for_arabic_diacritics"

                    latin:keyLabelFlags="hasPopupHint|hasShiftedLetterHint"

                    latin:moreKeys="!text/more_keys_for_arabic_diacritics"

                    latin:keyStyle="punctuationKeyStyle" />

java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java

+271 −250

File changed.

Preview size limit exceeded, changes collapsed.

tools/maketext/res/values-ar/donottranslate-more-keys.xml

+17 −0
Original line number Diff line number Diff line
@@ -105,4 +105,21 @@ 
    <!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->

    <!-- <string name="more_keys_for_tablet_double_quote">!fixedColumnOrder!6,&#x201C;,&#x201D;,&#x201E;,&#x201F;,&#x00AB;|&#x00BB;,&#x00BB|&#x00AB;;,&#x2018;,&#x2019;,&#x201A;,&#x201B;</string> -->

    <string name="more_keys_for_tablet_double_quote">!fixedColumnOrder!4,&#x201C;,&#x201D;,&#x00AB;|&#x00BB;,&#x00BB;|&#x00AB;,&#x2018;,&#x2019;,&#x201A;,&#x201B;</string>

    <!-- U+064F: "ُ" ARABIC DAMMA

         U+064C: "ٌ" ARABIC DAMMATAN

         U+0651: "ّ" ARABIC SHADDA

         U+0652: "ْ" ARABIC SUKUN

         U+0653: "ٓ" ARABIC MADDAH ABOVE -->

    <!-- U+064D: "ٍ" ARABIC KASRATAN

         U+064B: "ً" ARABIC FATHATAN

         U+0650: "ِ" ARABIC KASRA

         U+064E: "َ" ARABIC FATHA

         U+0640: "ـ" ARABIC TATWEEL -->

    <!-- U+0656: "ٖ" ARABIC SUBSCRIPT ALEF

         U+0670: "ٰ" ARABIC LETTER SUPERSCRIPT ALEF

         U+0655: "ٕ" ARABIC HAMZA BELOW

         U+0654: "ٔ" ARABIC HAMZA ABOVE -->

    <!-- In order to make Tatweel easily distinguishable from other punctuations, we use consecutive Tatweels only for its displayed label. -->

    <string name="more_keys_for_arabic_diacritics">"!fixedColumnOrder!5,&#x064F;,&#x064C;,&#x0651;,&#x0652;,&#x0653;,&#x064D;,&#x064B;,&#x0650;,&#x064E;,&#x0640;&#x0640;&#x0640;|&#x0640;,&#x0656;,&#x0670;,&#x0655;,&#x0654;"</string>

    <string name="keyhintlabel_for_arabic_diacritics">&#x064F;</string>

</resources>

tools/maketext/res/values-fa/donottranslate-more-keys.xml

+17 −0
Original line number Diff line number Diff line
@@ -108,4 +108,21 @@ 
    <!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->

    <!-- <string name="more_keys_for_tablet_double_quote">!fixedColumnOrder!6,&#x201C;,&#x201D;,&#x201E;,&#x201F;,&#x00AB;|&#x00BB;,&#x00BB|&#x00AB;;,&#x2018;,&#x2019;,&#x201A;,&#x201B;</string> -->

    <string name="more_keys_for_tablet_double_quote">!fixedColumnOrder!4,&#x201C;,&#x201D;,&#x00AB;|&#x00BB;,&#x00BB;|&#x00AB;,&#x2018;,&#x2019;,&#x201A;,&#x201B;</string>

    <!-- U+0651: "ّ" ARABIC SHADDA

         U+064F: "ُ" ARABIC DAMMA

         U+0650: "ِ" ARABIC KASRA

         U+064E: "َ" ARABIC FATHA

         U+0653: "ٓ" ARABIC MADDAH ABOVE -->

    <!-- U+0655: "ٕ" ARABIC HAMZA BELOW

         U+0654: "ٔ" ARABIC HAMZA ABOVE

         U+064D: "ٍ" ARABIC KASRATAN

         U+064B: "ً" ARABIC FATHATAN

         U+0652: "ْ" ARABIC SUKUN -->

    <!-- U+0640: "ـ" ARABIC TATWEEL

         U+064C: "ٌ" ARABIC DAMMATAN

         U+0656: "ٖ" ARABIC SUBSCRIPT ALEF

         U+0670: "ٰ" ARABIC LETTER SUPERSCRIPT ALEF -->

    <!-- In order to make Tatweel easily distinguishable from other punctuations, we use consecutive Tatweels only for its displayed label. -->

    <string name="more_keys_for_arabic_diacritics">"!fixedColumnOrder!5,&#x0651;,&#x064F;,&#x0650;,&#x064E;,&#x0653;,&#x0655;,&#x0654;,&#x064D;,&#x064B;,&#x0652;,&#x0640;&#x0640;&#x0640;|&#x0640;,&#x064C;,&#x0656;,&#x0670;"</string>

    <string name="keyhintlabel_for_arabic_diacritics">&#x0653;</string>

</resources>