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
diff --git a/Android.mk b/Android.mk
index d615547..425ae47 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,8 +18,6 @@
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-LOCAL_AAPT_FLAGS += -c zz_ZZ
-
include frameworks/opt/setupwizard/navigationbar/common.mk
include $(BUILD_PACKAGE)
diff --git a/src/com/android/settings/LocalePicker.java b/src/com/android/settings/LocalePicker.java
index 6600703..c6158b1 100644
--- a/src/com/android/settings/LocalePicker.java
+++ b/src/com/android/settings/LocalePicker.java
@@ -48,15 +48,6 @@
}
@Override
- protected boolean isInDeveloperMode() {
- final boolean showDev = getActivity().getSharedPreferences(DevelopmentSettings.PREF_FILE,
- Context.MODE_PRIVATE).getBoolean(
- DevelopmentSettings.PREF_SHOW,
- android.os.Build.TYPE.equals("eng"));
- return showDev;
- }
-
- @Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (savedInstanceState != null && savedInstanceState.containsKey(SAVE_TARGET_LOCALE)) {
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 @@
// 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 {