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

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

Merge "Rename string resource to more generic name"

parents 4df668d1 b9964b5f

java/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -358,9 +358,9 @@ 
         (US) should be an abbreviation of United Statesn to fit in the CHAR LIMIT.

         This should be identical to subtype_es_US aside from the trailing (%s). -->

    <string name="subtype_with_layout_es_US">Spanish (US) (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string>

    <!-- Description for Nepali (Traditional) keyboard subtype [CHAR LIMIT=25]

    <!-- Description for "LANGUAGE_NAME" (Traditional) keyboard subtype [CHAR LIMIT=25]

         (Traditional) can be an abbreviation to fit in the CHAR LIMIT. -->

    <string name="subtype_nepali_traditional"><xliff:g id="LANGUAGE_NAME" example="Nepali">%s</xliff:g> (Traditional)</string>

    <string name="subtype_generic_traditional"><xliff:g id="LANGUAGE_NAME" example="Nepali">%s</xliff:g> (Traditional)</string>

    <!-- TODO: Uncomment once we can handle IETF language tag with script name specified.

         Description for Serbian Cyrillic keyboard subtype [CHAR LIMIT=25]

         (Cyrillic) can be an abbreviation to fit in the CHAR LIMIT.

java/res/xml/method.xml

+1 −1
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ 
            android:isAsciiCapable="false"

    />

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

            android:label="@string/subtype_nepali_traditional"

            android:label="@string/subtype_generic_traditional"

            android:subtypeId="0x5fafea88"

            android:imeSubtypeLocale="ne_NP"

            android:imeSubtypeMode="keyboard"