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

Commit 5199b8bf authored by Ken Wakasa's avatar Ken Wakasa Committed by Android Git Automerger
Browse files

am f6df37ce: Merge "LatinIME: Add accents to german keyboard" 

* commit 'f6df37ce':
  LatinIME: Add accents to german keyboard
parents ef5f88f3 f6df37ce

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

+5 −1
Original line number Original line Diff line number Diff line
@@ -799,8 +799,12 @@ public final class KeyboardTextsSet { 
        // U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE

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

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

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

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

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

        // 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+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE

        // U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE

        /* 1 */ "\u0117",

        /* 1 */ "\u00E9,\u00E8,\u00EA,\u00EB,\u0117",

        /* 2 */ null,

        /* 2 */ null,

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

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

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

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

tools/maketext/res/values-de/donottranslate-more-keys.xml

+6 −2
Original line number Original line Diff line number Diff line
@@ -27,8 +27,12 @@ 
         U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE

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

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

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

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

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

    <!-- U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE -->

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

    <string name="more_keys_for_e">&#x0117;</string>

         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+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE -->

    <string name="more_keys_for_e">&#x00E9;,&#x00E8;,&#x00EA;,&#x00EB;,&#x0117;</string>

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

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

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

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

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

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