diff options
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values/donottranslate.xml | 10 | ||||
| -rw-r--r-- | java/res/values/strings.xml | 5 | ||||
| -rw-r--r-- | java/res/xml/method.xml | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml index 36412b48f..edf615acc 100644 --- a/java/res/values/donottranslate.xml +++ b/java/res/values/donottranslate.xml @@ -120,18 +120,14 @@ </string-array> <!-- Subtype locale display name exceptions. - For each exception, there should be related string resource for display name that has - explicit keyboard layout. The string resource name must be "subtype_with_layout_<locale>. --> + For each exception, there should be related string resources for display name that may have + explicit keyboard layout. The string resource name must be "subtype_<locale>" or + "subtype_with_layout_<locale>. Please refer to strings.xml for these resources. --> <string-array name="subtype_locale_exception_keys"> <item>en_US</item> <item>en_GB</item> <item>es_US</item> </string-array> - <string-array name="subtype_locale_exception_values"> - <item>English (US)</item> - <item>English (UK)</item> - <item>Español (EE.UU.)</item> - </string-array> <!-- Generic subtype label --> <string name="subtype_generic">%s</string> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index d8c2e84f5..1b518a189 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -322,12 +322,17 @@ <string name="subtype_en_GB">English (UK)</string> <!-- Description for English (United States) keyboard subtype [CHAR LIMIT=25] --> <string name="subtype_en_US">English (US)</string> + <!-- Description for Spanish (United States) keyboard subtype [CHAR LIMIT=25] --> + <string name="subtype_es_US">Spanish (US)</string> <!-- Description for English (United Kingdom) keyboard subtype with explicit keyboard layout [CHAR LIMIT=25] This should be identical to subtype_en_GB aside from the trailing (%s). --> <string name="subtype_with_layout_en_GB">English (UK) (<xliff:g id="layout">%s</xliff:g>)</string> <!-- Description for English (United States) keyboard subtype with explicit keyboard layout [CHAR LIMIT=25] This should be identical to subtype_en_US aside from the trailing (%s). --> <string name="subtype_with_layout_en_US">English (US) (<xliff:g id="layout">%s</xliff:g>)</string> + <!-- Description for Spanish (United States) keyboard subtype with explicit keyboard layout [CHAR LIMIT=25] + 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="layout">%s</xliff:g>)</string> <!-- TODO: Uncomment once we can handle IETF language tag with script name specified. Description for Serbian Cyrillic keyboard subtype [CHAR LIMIT=25] <string name="subtype_serbian_cyrillic">Serbian (Cyrillic)</string> diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml index aa59c577c..f30ef2362 100644 --- a/java/res/xml/method.xml +++ b/java/res/xml/method.xml @@ -186,7 +186,7 @@ android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" /> <subtype android:icon="@drawable/ic_subtype_keyboard" - android:label="@string/subtype_generic" + android:label="@string/subtype_es_US" android:subtypeId="0x84d2efc6" android:imeSubtypeLocale="es_US" android:imeSubtypeMode="keyboard" |