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

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

Use obsolete language code of Indonesian 

The java.lang.Locale will transform the official language code "id" to
the obsolete "in".  (new Locale("id")).getLanguageCode() returns
"in". To keep String representation and Locale compatible, we should
use the obsolete "in" as string representation.

This is exactly the same situation of Hebrew ("he" and "iw").

Bug: 6867914
Change-Id: I1a6ea6336d55cbf8a214f025aecf65308fb76140
parent 369e54cc

java/res/xml/method.xml

+4 −3
Original line number Original line Diff line number Diff line
@@ -42,10 +42,10 @@ 
    hi: Hindi/hindi

    hi: Hindi/hindi

    hr: Croatian/qwertz

    hr: Croatian/qwertz

    hu: Hungarian/qwertz

    hu: Hungarian/qwertz

    id: Indonesian/qwerty

    in: Indonesian/qwerty    # "id" is official language code of Indonesian.

    is: Icelandic/qwerty

    is: Icelandic/qwerty

    it: Italian/qwerty

    it: Italian/qwerty

    iw: Hebrew/hebrew

    iw: Hebrew/hebrew        # "he" is official language code of Hebrew.

    ka: Georgian/georgian

    ka: Georgian/georgian

    ky: Kyrgyz/east_slavic

    ky: Kyrgyz/east_slavic

    lt: Lithuanian/qwerty

    lt: Lithuanian/qwerty
@@ -197,9 +197,10 @@ 
            android:imeSubtypeMode="keyboard"

            android:imeSubtypeMode="keyboard"

            android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"

            android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection"

    />

    />

    <!-- Java uses the deprecated "in" code instead of the standard "id" code for Indonesian. -->

    <subtype android:icon="@drawable/ic_subtype_keyboard"

    <subtype android:icon="@drawable/ic_subtype_keyboard"

            android:label="@string/subtype_generic"

            android:label="@string/subtype_generic"

            android:imeSubtypeLocale="id"

            android:imeSubtypeLocale="in"

            android:imeSubtypeMode="keyboard"

            android:imeSubtypeMode="keyboard"

            android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable"

            android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable"

    />

    />