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

Commit 3d77934e authored by Ken Wakasa's avatar Ken Wakasa Committed by Android Git Automerger
Browse files

am 55e7b360: Merge "More tweaks for Armenian layouts" 

* commit '55e7b360':
  More tweaks for Armenian layouts
parents 572c1ac5 55e7b360

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

+15 −3
Original line number Diff line number Diff line
@@ -1769,15 +1769,27 @@ 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+058A: "֊" ARMENIAN HYPHEN

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

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

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

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

        // U+055A: "" ARMENIAN APOSTROPHE

        // 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",

        /* 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,

        /* ~99 */

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

        // U+00A1: "¡" INVERTED EXCLAMATION MARK

        /* 100 */ "\u055C,\u00A1",

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

        // U+00BF: "¿" INVERTED QUESTION MARK

        /* 101 */ "\u055E,\u00BF",

    };



    /* Language is: Icelandic */

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

+6 −0
Original line number Diff line number Diff line
@@ -27,6 +27,12 @@ 
    <!-- 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+055E: "՞" ARMENIAN QUESTION MARK -->

    <!-- U+00BF: "¿" INVERTED QUESTION MARK -->

    <string name="more_keys_for_symbols_question">&#x055E;,&#x00BF;</string>

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

    <!-- U+00A1: "¡" INVERTED EXCLAMATION MARK -->

    <string name="more_keys_for_symbols_exclamation">&#x055C;,&#x00A1;</string>

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

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

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