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

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

Fix alphabet label of Kannada and Telugu 

Bug: 10029252
Bug: 10028759
Change-Id: Iea9cc1b7cafa97280503b0236b005cea57ba2c3d
parent 7f14894f

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

+8 −8
Original line number Diff line number Diff line
@@ -2299,10 +2299,10 @@ public final class KeyboardTextsTable { 
        null, null, null, null, null,

        /* ~ morekeys_i */

        // Label for "switch to alphabetic" key.

        // U+0C95: "ಕ" KANNADA LETTER KA

        // U+0CA8/U+0CCD/U+0CA8: "ನ್ನ" KANNADA LETTER NA/KANNADA SIGN VIRAMA/KANNADA LETTER NA

        // U+0CA1: "ಡ" KANNADA LETTER DDA

        /* keylabel_to_alpha */ "\u0C95\u0CA8\u0CCD\u0CA8\u0CA1",

        // U+0C85: "ಅ" KANNADA LETTER A

        // U+0C86: "ಆ" KANNADA LETTER AA

        // U+0C87: "ಇ" KANNADA LETTER I

        /* keylabel_to_alpha */ "\u0C85\u0C86\u0C87",

        /* morekeys_c ~ */

        null, null, null, null, null,

        /* ~ morekeys_s */
@@ -3434,10 +3434,10 @@ public final class KeyboardTextsTable { 
        null, null, null, null, null,

        /* ~ morekeys_i */

        // Label for "switch to alphabetic" key.

        // U+0C24/U+0C46: "తె" TELUGU LETTER TA/TELUGU VOWEL SIGN E

        // U+0C32/U+0C41: "లు" TELUGU LETTER LA/TELUGU VOWEL SIGN U

        // U+0C17/U+0C41: "గు" TELUGU LETTER GA/TELUGU VOWEL SIGN U

        /* keylabel_to_alpha */ "\u0C24\u0C46\u0C32\u0C41\u0C17\u0C41",

        // U+0C05: "అ" TELUGU LETTER A

        // U+0C06: "ఆ" TELUGU LETTER AA

        // U+0C07: "ఇ" TELUGU LETTER I

        /* keylabel_to_alpha */ "\u0C05\u0C06\u0C07",

        /* morekeys_c ~ */

        null, null, null, null, null,

        /* ~ morekeys_s */

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

+4 −4
Original line number Diff line number Diff line
@@ -64,11 +64,11 @@ public final class Kannada extends LayoutBase { 
            return joinKeys(LANGUAGE_SWITCH_KEY, SPACE_KEY, key(ZWNJ_KEY, ZWJ_KEY));

        }



        // U+0C95: "ಕ" KANNADA LETTER KA

        // U+0CA8/U+0CCD/U+0CA8: "ನ್ನ" KANNADA LETTER NA/KANNADA SIGN VIRAMA/KANNADA LETTER NA

        // U+0CA1: "ಡ" KANNADA LETTER DDA

        // U+0C85: "ಅ" KANNADA LETTER A

        // U+0C86: "ಆ" KANNADA LETTER AA

        // U+0C87: "ಇ" KANNADA LETTER I

        private static final ExpectedKey KANNADA_ALPHABET_KEY = key(

                "\u0C95\u0CA8\u0CCD\u0CA8\u0CA1", Constants.CODE_SWITCH_ALPHA_SYMBOL);

                "\u0C85\u0C86\u0C87", Constants.CODE_SWITCH_ALPHA_SYMBOL);



        // U+20B9: "₹" INDIAN RUPEE SIGN

        private static final ExpectedKey CURRENCY_RUPEE = key("\u20B9",

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

+4 −4
Original line number Diff line number Diff line
@@ -64,11 +64,11 @@ public final class Telugu extends LayoutBase { 
            return joinKeys(LANGUAGE_SWITCH_KEY, SPACE_KEY, key(ZWNJ_KEY, ZWJ_KEY));

        }



        // U+0C24/U+0C46: "తె" TELUGU LETTER TA/TELUGU VOWEL SIGN E

        // U+0C32/U+0C41: "లు" TELUGU LETTER LA/TELUGU VOWEL SIGN U

        // U+0C17/U+0C41: "గు" TELUGU LETTER GA/TELUGU VOWEL SIGN U

        // U+0C05: "అ" TELUGU LETTER A

        // U+0C06: "ఆ" TELUGU LETTER AA

        // U+0C07: "ఇ" TELUGU LETTER I

        private static final ExpectedKey TELUGU_ALPHABET_KEY = key(

                "\u0C24\u0C46\u0C32\u0C41\u0C17\u0C41", Constants.CODE_SWITCH_ALPHA_SYMBOL);

                "\u0C05\u0C06\u0C07", Constants.CODE_SWITCH_ALPHA_SYMBOL);



        // U+20B9: "₹" INDIAN RUPEE SIGN

        private static final ExpectedKey CURRENCY_RUPEE = key("\u20B9",

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

+4 −4
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ 
-->

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

    <!-- Label for "switch to alphabetic" key.

         U+0C95: "ಕ" KANNADA LETTER KA

         U+0CA8/U+0CCD/U+0CA8: "ನ್ನ" KANNADA LETTER NA/KANNADA SIGN VIRAMA/KANNADA LETTER NA

         U+0CA1: "ಡ" KANNADA LETTER DDA -->

    <string name="keylabel_to_alpha">&#x0C95;&#x0CA8;&#x0CCD;&#x0CA8;&#x0CA1;</string>

         U+0C85: "ಅ" KANNADA LETTER A

         U+0C86: "ಆ" KANNADA LETTER AA

         U+0C87: "ಇ" KANNADA LETTER I -->

    <string name="keylabel_to_alpha">&#x0C85;&#x0C86;&#x0C87;</string>

    <!-- U+20B9: "₹" INDIAN RUPEE SIGN -->

    <string name="keyspec_currency">&#x20B9;</string>

</resources>

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

+4 −4
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ 
-->

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

    <!-- Label for "switch to alphabetic" key.

         U+0C24/U+0C46: "తె" TELUGU LETTER TA/TELUGU VOWEL SIGN E

         U+0C32/U+0C41: "లు" TELUGU LETTER LA/TELUGU VOWEL SIGN U

         U+0C17/U+0C41: "గు" TELUGU LETTER GA/TELUGU VOWEL SIGN U -->

    <string name="keylabel_to_alpha">&#x0C24;&#x0C46;&#x0C32;&#x0C41;&#x0C17;&#x0C41;</string>

         U+0C05: "అ" TELUGU LETTER A

         U+0C06: "ఆ" TELUGU LETTER AA

         U+0C07: "ఇ" TELUGU LETTER I -->

    <string name="keylabel_to_alpha">&#x0C05;&#x0C06;&#x0C07;</string>

    <!-- U+20B9: "₹" INDIAN RUPEE SIGN -->

    <string name="keyspec_currency">&#x20B9;</string>

</resources>