Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5ee3bc8 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android (Google) Code Review
Browse files

Merge "Settings psuedolocalization fixes." into lmp-dev

parents 8802ccf8 c550f0bf

Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ LOCAL_PRIVILEGED_MODULE := true 


LOCAL_PROGUARD_FLAG_FILES := proguard.flags



LOCAL_AAPT_FLAGS += -c zz_ZZ



include frameworks/opt/setupwizard/navigationbar/common.mk



include $(BUILD_PACKAGE)

src/com/android/settings/LocalePicker.java

+0 −9
Original line number Diff line number Diff line
@@ -47,15 +47,6 @@ public class LocalePicker extends com.android.internal.app.LocalePicker 
        setLocaleSelectionListener(this);

    }



    @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);

src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java

+1 −10
Original line number Diff line number Diff line
@@ -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 {