diff options
| author | Elliott Hughes <enh@google.com> | 2014-08-22 20:42:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-22 20:42:38 +0000 |
| commit | d5ee3bc858f2e3c7e4dee6887c982c768c355c7a (patch) | |
| tree | 11789a9e39875f2e181138e6941b5c0c35442a04 /src/com/android/settings/inputmethod | |
| parent | 8802ccf853b86ba56816ddd06346812b61e58220 (diff) | |
| parent | c550f0bff4b668f725b990df37c97077418d7058 (diff) | |
| download | packages_apps_Settings-d5ee3bc858f2e3c7e4dee6887c982c768c355c7a.zip packages_apps_Settings-d5ee3bc858f2e3c7e4dee6887c982c768c355c7a.tar.gz packages_apps_Settings-d5ee3bc858f2e3c7e4dee6887c982c768c355c7a.tar.bz2 | |
Merge "Settings psuedolocalization fixes." into lmp-dev
Diffstat (limited to 'src/com/android/settings/inputmethod')
| -rw-r--r-- | src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java index d0bc0cc..e1bcac5 100644 --- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java +++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java @@ -335,16 +335,7 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment // and want to pretend that the language is valid for all locales. // We need a way to support languages that aren't tied to a particular // locale instead of hiding the locale qualifier. - if (language.equals("zz")) { - String country = conf.locale.getCountry(); - if (country.equals("ZZ")) { - localeName = "[Developer] Accented English (zz_ZZ)"; - } else if (country.equals("ZY")) { - localeName = "[Developer] Fake Bi-Directional (zz_ZY)"; - } else { - localeName = ""; - } - } else if (hasOnlyOneLanguageInstance(language, + if (hasOnlyOneLanguageInstance(language, Resources.getSystem().getAssets().getLocales())) { localeName = conf.locale.getDisplayLanguage(conf.locale); } else { |