Merge "Fix fetching incorrect items after filtering" into tm-dev (9b4b25e3) · Commits · e / os / android_frameworks_base

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)

+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;
		}
		}