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

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

am 38dc9ca3: Fix duplicate period on Persian tablet keyboard 

* commit '38dc9ca3':
  Fix duplicate period on Persian tablet keyboard
parents 58f9b35e 38dc9ca3

java/res/xml-sw600dp/key_apostrophe.xml

+10 −0
Original line number Diff line number Diff line
@@ -28,6 +28,16 @@ 
            <Key

                latin:keyLabel="-" />

        </case>

        <case

            latin:languageCode="fa"

        >

            <Key

                latin:keyLabel="!text/keylabel_for_apostrophe"

                latin:keyHintLabel="!text/keyhintlabel_for_apostrophe"

                latin:keyLabelFlags="hasPopupHint"

                latin:moreKeys="!text/more_keys_for_apostrophe"

                latin:keyStyle="hasShiftedLetterHintStyle" />

        </case>

        <default>

            <Key

                latin:keyLabel="!text/keylabel_for_apostrophe"

java/res/xml-sw600dp/key_dash.xml

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
            <Key

                latin:keyLabel="."

                latin:keyHintLabel="!text/keyhintlabel_for_arabic_diacritics"

                latin:keyLabelFlags="hasPopupHint"

                latin:moreKeys="!text/more_keys_for_arabic_diacritics"

                latin:keyStyle="hasShiftedLetterHintStyle" />

        </case>

java/res/xml-sw600dp/rowkeys_farsi3.xml

+8 −4
Original line number Diff line number Diff line
@@ -27,11 +27,12 @@ 
    <!-- U+0637: "ط" ARABIC LETTER TAH -->

    <Key

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

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

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

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

    <Key

        latin:keyLabel="&#x0632;"

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

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

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

    <Key

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

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

    <Key

        latin:keyLabel="&#x0631;" />
@@ -49,4 +50,7 @@ 
    <Key

        latin:keyLabel="&#x0648;"

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

    <!-- U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->

    <Key

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

</merge>

java/res/xml-sw600dp/rows_farsi.xml

+0 −2
Original line number Diff line number Diff line
@@ -44,8 +44,6 @@ 
        <include

            latin:keyboardLayout="@xml/rowkeys_farsi3"

            latin:keyXPos="4.091%p" />

        <include

            latin:keyboardLayout="@xml/keys_comma_period" />

        <Key

            latin:keyStyle="enterKeyStyle"

            latin:keyWidth="fillRight" />

java/res/xml-sw768dp/rows_farsi.xml

+0 −2
Original line number Diff line number Diff line
@@ -52,8 +52,6 @@ 
        <include

            latin:keyboardLayout="@xml/rowkeys_farsi3"

            latin:keyXPos="13.829%p" />

        <include

            latin:keyboardLayout="@xml/keys_comma_period" />

        <Key

            latin:keyStyle="enterKeyStyle"

            latin:keyWidth="fillRight" />