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

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

Reorder accented letters of English 

This is a follow up change of Idff0b6d08e.

Bug: 13177865
Change-Id: I00ea7cda954efbd248d2abc2fa6d4995d6acbf19
parent 1a180c15

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

+8 −8
Original line number Diff line number Diff line
@@ -3588,33 +3588,33 @@ public final class KeyboardTextsTable { 
        // U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE

        // U+0101: "ā" LATIN SMALL LETTER A WITH MACRON

        /* morekeys_a */ "\u00E0,\u00E1,\u00E2,\u00E4,\u00E6,\u00E3,\u00E5,\u0101",

        // U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE

        // U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX

        // U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS

        // U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE

        // U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE

        // U+0153: "œ" LATIN SMALL LIGATURE OE

        // U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE

        // U+014D: "ō" LATIN SMALL LETTER O WITH MACRON

        // U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE

        /* morekeys_o */ "\u00F4,\u00F6,\u00F2,\u00F3,\u0153,\u00F8,\u014D,\u00F5",

        /* morekeys_o */ "\u00F3,\u00F4,\u00F6,\u00F2,\u0153,\u00F8,\u014D,\u00F5",

        // U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE

        // U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX

        // U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS

        // U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE

        // U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE

        // U+016B: "ū" LATIN SMALL LETTER U WITH MACRON

        /* morekeys_u */ "\u00FB,\u00FC,\u00F9,\u00FA,\u016B",

        // U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE

        /* morekeys_u */ "\u00FA,\u00FB,\u00FC,\u00F9,\u016B",

        // U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE

        // U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE

        // U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX

        // U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS

        // U+0113: "ē" LATIN SMALL LETTER E WITH MACRON

        /* morekeys_e */ "\u00E8,\u00E9,\u00EA,\u00EB,\u0113",

        /* morekeys_e */ "\u00E9,\u00E8,\u00EA,\u00EB,\u0113",

        // U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE

        // U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX

        // U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS

        // U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE

        // U+012B: "ī" LATIN SMALL LETTER I WITH MACRON

        // U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE

        /* morekeys_i */ "\u00EE,\u00EF,\u00ED,\u012B,\u00EC",

        /* morekeys_i */ "\u00ED,\u00EE,\u00EF,\u012B,\u00EC",

        // U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA

        /* morekeys_c */ "\u00E7",

        /* double_quotes */ null,

tests/src/com/android/inputmethod/keyboard/layout/tests/EnglishCustomizer.java

+8 −8
Original line number Diff line number Diff line
@@ -27,34 +27,34 @@ class EnglishCustomizer extends LayoutCustomizer { 
    @Override

    public ExpectedKeyboardBuilder setAccentedLetters(final ExpectedKeyboardBuilder builder) {

        return builder

                // U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE

                // U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE

                // U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE

                // U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX

                // U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS

                // U+0113: "ē" LATIN SMALL LETTER E WITH MACRON

                .setMoreKeysOf("e", "\u00E8", "\u00E9", "\u00EA", "\u00EB", "\u0113")

                .setMoreKeysOf("e", "\u00E9", "\u00E8", "\u00EA", "\u00EB", "\u0113")

                // U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE

                // U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX

                // U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS

                // U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE

                // U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE

                // U+016B: "ū" LATIN SMALL LETTER U WITH MACRON

                .setMoreKeysOf("u", "\u00FB", "\u00FC", "\u00F9", "\u00FA", "\u016B")

                .setMoreKeysOf("u", "\u00FA", "\u00FB", "\u00FC", "\u00F9", "\u016B")

                // U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE

                // U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX

                // U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS

                // U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE

                // U+012B: "ī" LATIN SMALL LETTER I WITH MACRON

                // U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE

                .setMoreKeysOf("i", "\u00EE", "\u00EF", "\u00ED", "\u012B", "\u00EC")

                .setMoreKeysOf("i", "\u00ED", "\u00EE", "\u00EF", "\u012B", "\u00EC")

                // U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE

                // U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX

                // U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS

                // U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE

                // U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE

                // U+0153: "œ" LATIN SMALL LIGATURE OE

                // U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE

                // U+014D: "ō" LATIN SMALL LETTER O WITH MACRON

                // U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE

                .setMoreKeysOf("o",

                        "\u00F4", "\u00F6", "\u00F2", "\u00F3", "\u0153", "\u00F8", "\u014D",

                        "\u00F3", "\u00F4", "\u00F6", "\u00F2", "\u0153", "\u00F8", "\u014D",

                        "\u00F5")

                // U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE

                // U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX

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

+12 −12
Original line number Diff line number Diff line
@@ -28,33 +28,33 @@ 
         U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE

         U+0101: "ā" LATIN SMALL LETTER A WITH MACRON -->

    <string name="morekeys_a">&#x00E0;,&#x00E1;,&#x00E2;,&#x00E4;,&#x00E6;,&#x00E3;,&#x00E5;,&#x0101;</string>

    <!-- U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE

         U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE

    <!-- U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE

         U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE

         U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX

         U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS

         U+0113: "ē" LATIN SMALL LETTER E WITH MACRON -->

    <string name="morekeys_e">&#x00E8;,&#x00E9;,&#x00EA;,&#x00EB;,&#x0113;</string>

    <!-- U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX

    <string name="morekeys_e">&#x00E9;,&#x00E8;,&#x00EA;,&#x00EB;,&#x0113;</string>

    <!-- U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE

         U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX

         U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS

         U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE

         U+012B: "ī" LATIN SMALL LETTER I WITH MACRON

         U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE -->

    <string name="morekeys_i">&#x00EE;,&#x00EF;,&#x00ED;,&#x012B;,&#x00EC;</string>

    <!-- U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX

    <string name="morekeys_i">&#x00ED;,&#x00EE;,&#x00EF;,&#x012B;,&#x00EC;</string>

    <!-- U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE

         U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX

         U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS

         U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE

         U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE

         U+0153: "œ" LATIN SMALL LIGATURE OE

         U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE

         U+014D: "ō" LATIN SMALL LETTER O WITH MACRON

         U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE -->

    <string name="morekeys_o">&#x00F4;,&#x00F6;,&#x00F2;,&#x00F3;,&#x0153;,&#x00F8;,&#x014D;,&#x00F5;</string>

    <!-- U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX

    <string name="morekeys_o">&#x00F3;,&#x00F4;,&#x00F6;,&#x00F2;,&#x0153;,&#x00F8;,&#x014D;,&#x00F5;</string>

    <!-- U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE

         U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX

         U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS

         U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE

         U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE

         U+016B: "ū" LATIN SMALL LETTER U WITH MACRON -->

    <string name="morekeys_u">&#x00FB;,&#x00FC;,&#x00F9;,&#x00FA;,&#x016B;</string>

    <string name="morekeys_u">&#x00FA;,&#x00FB;,&#x00FC;,&#x00F9;,&#x016B;</string>

    <!-- U+00DF: "ß" LATIN SMALL LETTER SHARP S -->

    <string name="morekeys_s">&#x00DF;</string>

    <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE -->