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

Commit 9eec53a2 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Reorder German umlaut letters"

parents 0ce38865 784a4429

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

+3 −3
Original line number Diff line number Diff line
@@ -981,7 +981,7 @@ public final class KeyboardTextsTable { 
        // U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE

        // U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE

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

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

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

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

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

        // U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
@@ -990,13 +990,13 @@ public final class KeyboardTextsTable { 
        // U+0153: "œ" LATIN SMALL LIGATURE OE

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

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

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

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

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

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

        // 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 */ "\u00FC,\u00FB,\u00F9,\u00FA,\u016B",

        /* morekeys_u */ "\u00FC,%,\u00FB,\u00F9,\u00FA,\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

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

+3 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ class GermanCustomizer extends LayoutCustomizer { 
                // U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE

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

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

                .setAdditionalMoreKeysPositionOf("u", 2)

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

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

                // U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE
@@ -64,6 +65,7 @@ class GermanCustomizer extends LayoutCustomizer { 
                .setMoreKeysOf("o",

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

                        "\u014D")

                .setAdditionalMoreKeysPositionOf("o", 2)

                // U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS

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

                // U+00E0: "à" LATIN SMALL LETTER A WITH GRAVE
@@ -75,6 +77,7 @@ class GermanCustomizer extends LayoutCustomizer { 
                .setMoreKeysOf("a",

                        "\u00E4", "\u00E2", "\u00E0", "\u00E1", "\u00E6", "\u00E3", "\u00E5",

                        "\u0101")

                .setAdditionalMoreKeysPositionOf("a", 2)

                // U+00DF: "ß" LATIN SMALL LETTER SHARP S

                // U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE

                // U+0161: "š" LATIN SMALL LETTER S WITH CARON

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

+3 −3
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
         U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE

         U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE

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

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

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

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

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

         U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
@@ -41,13 +41,13 @@ 
         U+0153: "œ" LATIN SMALL LIGATURE OE

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

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

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

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

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

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

         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">&#x00FC;,&#x00FB;,&#x00F9;,&#x00FA;,&#x016B;</string>

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

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

         U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE

         U+0161: "š" LATIN SMALL LETTER S WITH CARON -->