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

Commit 5fad442f authored by Ken Wakasa's avatar Ken Wakasa Committed by Android Git Automerger
Browse files

am d8c037c1: Merge "Tweaks for Armenian layouts" 

* commit 'd8c037c1':
  Tweaks for Armenian layouts
parents d82be209 d8c037c1

java/res/xml/key_styles_currency.xml

+2 −0
Original line number Diff line number Diff line
@@ -103,6 +103,8 @@ 
             vi: Vietnamese (Dong)  -->

        <!-- TODO: The currency sign of Turkish Lira was created in 2012 and assigned U+20BA for

             its unicode, although there is no font glyph for it as of November 2012. -->

        <!-- TODO: The currency sign of Armenian Dram was created in 2012 and assigned U+058F for

             its unicode, although there is no font glyph for it as of September 2013. -->

        <case

            latin:languageCode="fa|hi|iw|lo|mn|ne|th|uk|vi"

        >

java/res/xml/keys_comma_period.xml

+14 −0
Original line number Diff line number Diff line
@@ -73,6 +73,20 @@ 
                latin:backgroundType="functional"

                latin:keyStyle="hasShiftedLetterHintStyle" />

        </case>

        <case

            latin:languageCode="hy"

        >

            <!-- U+0589: "։" ARMENIAN FULL STOP -->

            <Key

                latin:keyLabel="&#x0589;"

                latin:keyLabelFlags="hasPopupHint"

                latin:backgroundType="functional"

                latin:moreKeys="!text/more_keys_for_punctuation" />

            <!-- U+055D: "՝" ARMENIAN COMMA -->

            <Key

                latin:keyLabel="&#x055D;"

                latin:backgroundType="functional" />

        </case>

        <default>

            <Key

                latin:keyLabel="."

java/res/xml/row_qwerty4.xml

+8 −0
Original line number Diff line number Diff line
@@ -49,6 +49,14 @@ 
                <include

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

            </case>

            <case

                latin:languageCode="hy"

            >

                <!-- U+0589: "։" ARMENIAN FULL STOP -->

                <Key

                    latin:keyLabel="&#x0589;"

                    latin:keyStyle="punctuationKeyStyle" />

            </case>

            <default>

                <Key

                    latin:keyStyle="punctuationKeyStyle" />

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

+8 −8
Original line number Diff line number Diff line
@@ -1769,15 +1769,15 @@ public final class KeyboardTextsSet { 
        null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,

        null, null, null, null, null, null, null, null,

        /* ~52 */

        // U+058A: "" ARMENIAN HYPHEN

        // U+055C: "՜" ARMENIAN EXCLAMATION MARK

        // U+055D: "՝" ARMENIAN COMMA

        // U+055E: "՞" ARMENIAN QUESTION MARK

        /* 53 */ "!fixedColumnOrder!4,\u055E,!,\\,,?,:,;,@",

        /* 54~ */

        null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,

        null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,

        null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,

        null, null, null, null, null, null, null, null, null,

        /* ~107 */

        /* 108 */ "\u055E,?",

        // U+0559: "" ARMENIAN MODIFIER LETTER LEFT HALF RING

        // U+055A: "" ARMENIAN APOSTROPHE

        // U+055B: "՛" ARMENIAN EMPHASIS MARK

        // U+055F: "՟" ARMENIAN ABBREVIATION MARK

        /* 53 */ "!fixedColumnOrder!8,!,?,\\,,.,\u058A,\u055C,\u055D,\u055E,:,;,@,\u0559,\u055A,\u055B,\u055F",

    };



    /* Language is: Icelandic */

tools/make-keyboard-text/res/values-hy/donottranslate-more-keys.xml

+12 −2
Original line number Diff line number Diff line
@@ -18,7 +18,17 @@ 
*/

-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- U+058A: "֊" ARMENIAN HYPHEN -->

    <!-- U+055C: "՜" ARMENIAN EXCLAMATION MARK -->

    <!-- U+055D: "՝" ARMENIAN COMMA -->

    <!-- U+055E: "՞" ARMENIAN QUESTION MARK -->

    <string name="more_keys_for_punctuation">"!fixedColumnOrder!4,&#x055E;,!,\\,,\?,:,;,\@"</string>

    <string name="more_keys_for_tablet_period">&#x055E;,\?</string>

    <!-- U+0559: "ՙ" ARMENIAN MODIFIER LETTER LEFT HALF RING -->

    <!-- U+055A: "՚" ARMENIAN APOSTROPHE -->

    <!-- U+055B: "՛" ARMENIAN EMPHASIS MARK -->

    <!-- U+055F: "՟" ARMENIAN ABBREVIATION MARK -->

    <string name="more_keys_for_punctuation">"!fixedColumnOrder!8,!,?,\\,,.,&#x058A;,&#x055C;,&#x055D;,&#x055E;,:,;,\@,&#x0559;,&#x055A;,&#x055B;,&#x055F;"</string>

    <!-- U+058F: "֏" ARMENIAN DRAM SIGN -->

    <!-- TODO: Enable this when we have glyph for the following letter

         <string name="keylabel_for_currency">&#x058F;</string>

    -->

</resources>