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

Commit a5fb7e3c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix fetching incorrect items after filtering" into tm-dev am: 9b4b25e3 am: ff49de4d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17537785



Change-Id: Iae951401debb841f0e2e0d1494218112340dccab
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c2049943 ff49de4d

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

+3 −4
Original line number Diff line number Diff line
@@ -264,10 +264,9 @@ public class LocalePickerWithRegion extends ListFragment implements SearchView.O 
    }



    @Override

    public void onListItemClick(ListView l, View v, int position, long id) {

        SuggestedLocaleAdapter adapter = (SuggestedLocaleAdapter) getListAdapter();

    public void onListItemClick(ListView parent, View v, int position, long id) {

        final LocaleStore.LocaleInfo locale =

                (LocaleStore.LocaleInfo) adapter.getItem(position);

                (LocaleStore.LocaleInfo) parent.getAdapter().getItem(position);

        // Special case for resetting the app locale to equal the system locale.

        boolean isSystemLocale = locale.isSystemLocale();

        boolean isRegionLocale = locale.getParent() != null;
@@ -280,7 +279,7 @@ public class LocalePickerWithRegion extends ListFragment implements SearchView.O 
        } else {

            LocalePickerWithRegion selector = LocalePickerWithRegion.createCountryPicker(

                    getContext(), mListener, locale, mTranslatedOnly /* translate only */,

                    adapter.getAppPackageName());

                    mAppPackageName);

            if (selector != null) {

                getFragmentManager().beginTransaction()

                        .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)

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

+0 −4
Original line number Diff line number Diff line
@@ -348,8 +348,4 @@ public class SuggestedLocaleAdapter extends BaseAdapter implements Filterable { 
    public Filter getFilter() {

        return new FilterByNativeAndUiNames();

    }



    public String getAppPackageName() {

        return mAppPackageName;

    }

}