From c550f0bff4b668f725b990df37c97077418d7058 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 22 Aug 2014 12:06:23 -0700 Subject: 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 --- .../settings/inputmethod/InputMethodAndLanguageSettings.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'src/com/android/settings/inputmethod') 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 { -- cgit v1.1