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

Commit e16a1bfa authored by Daisuke Miyakawa's avatar Daisuke Miyakawa
Browse files

Use system locale list. 

Context's assets may be different from system's. We should
prefer system's to reflect PRODUCT_LOCALE.

Bug: 4104675
Change-Id: I968c3baf6bfeb945f1b71ec709d5088332482319
parent e8f95e7f

core/java/com/android/internal/app/LocalePicker.java

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ public class LocalePicker extends ListFragment { 
    public static ArrayAdapter<LocaleInfo> constructAdapter(Context context,

            int layoutId, int fieldId) {

        final Resources resources = context.getResources();

        final String[] locales = context.getAssets().getLocales();

        final String[] locales = Resources.getSystem().getAssets().getLocales();

        final String[] specialLocaleCodes = resources.getStringArray(R.array.special_locale_codes);

        final String[] specialLocaleNames = resources.getStringArray(R.array.special_locale_names);

        Arrays.sort(locales);