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

Commit 21c83b4d authored by Daisuke Miyakawa's avatar Daisuke Miyakawa Committed by Android Git Automerger
Browse files

am f15b3db3: am 10221a22: am b02d3956: am e16a1bfa: Use system locale list. 

* commit 'f15b3db3':
  Use system locale list.
parents e4af0ed6 f15b3db3

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