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

Commit 4105f1e9 authored by Daisuke Miyakawa's avatar Daisuke Miyakawa Committed by Android (Google) Code Review
Browse files

Merge "Let callers replace layout for LocalePicker adapter."

parents 864dd1ca 2b133574

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

+5 −2
Original line number Diff line number Diff line
@@ -82,6 +82,11 @@ public class LocalePicker extends ListFragment { 
     * {@link LocaleInfo#label}.

     */

    public static ArrayAdapter<LocaleInfo> constructAdapter(Context context) {

        return constructAdapter(context, R.layout.locale_picker_item, R.id.locale);

    }



    public static ArrayAdapter<LocaleInfo> constructAdapter(Context context,

            int layoutId, int fieldId) {

        final Resources resources = context.getResources();

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

        final String[] specialLocaleCodes = resources.getStringArray(R.array.special_locale_codes);
@@ -149,8 +154,6 @@ public class LocalePicker extends ListFragment { 
            localeInfos[i] = preprocess[i];

        }

        Arrays.sort(localeInfos);

        final int layoutId = R.layout.locale_picker_item;

        final int fieldId = R.id.locale;

        return new ArrayAdapter<LocaleInfo>(context, layoutId, fieldId, localeInfos);

    }