diff options
| author | Elliott Hughes <enh@google.com> | 2014-08-22 12:06:23 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-08-22 12:24:00 -0700 |
| commit | c550f0bff4b668f725b990df37c97077418d7058 (patch) | |
| tree | 7af72da63c895e55b53e97767bc9dab19d4d789f /src/com/android/settings/inputmethod | |
| parent | 735219be8f85bd1ad41ab91834e5a427bb2ae7fc (diff) | |
| download | packages_apps_Settings-c550f0bff4b668f725b990df37c97077418d7058.zip packages_apps_Settings-c550f0bff4b668f725b990df37c97077418d7058.tar.gz packages_apps_Settings-c550f0bff4b668f725b990df37c97077418d7058.tar.bz2 | |
Settings psuedolocalization fixes.
We don't need -c zz_ZZ any more, and LocalePicker now checks
the global developer options settings itself.
Also remove some dead code now zz_ZY and zz_ZZ are gone.
Bug: 17190407
Change-Id: I27f9f5bc8b27457004e7e4996ec76b76a17523eb
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 3528c56..12e8801 100644 --- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java +++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java @@ -339,16 +339,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 { |