From 7f4b8b17841de170cdc30bbad19d3bee1cc8ce06 Mon Sep 17 00:00:00 2001 From: Mill Chen Date: Fri, 14 Jan 2022 15:51:31 +0800 Subject: Enable nested scrolling for locale picker This change is to make the locale picker list enable the nested scrolling feature. It is necessay to enable this feature to be able to work with CollapsingToolbarLayout. Fixes: 207318265 Fixes: 213036789 Test: manual test 1. Verify the locale picker works with Activity 2. Verify the locale picker works with SettingsBaseActivity Change-Id: Iaf90211da640cd265fc2b23dd34b3149c4406891 (cherry picked from commit fa861a6b5d87bae55319f5d92897d26ef490929f) Merged-In:Iaf90211da640cd265fc2b23dd34b3149c4406891 --- core/java/com/android/internal/app/LocalePickerWithRegion.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/core/java/com/android/internal/app/LocalePickerWithRegion.java b/core/java/com/android/internal/app/LocalePickerWithRegion.java index d0719eeca04e..b4ae56f23443 100644 --- a/core/java/com/android/internal/app/LocalePickerWithRegion.java +++ b/core/java/com/android/internal/app/LocalePickerWithRegion.java @@ -158,6 +158,14 @@ public class LocalePickerWithRegion extends ListFragment implements SearchView.O setListAdapter(mAdapter); } + @Override + public void onViewCreated(View view, Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + // In order to make the list view work with CollapsingToolbarLayout, + // we have to enable the nested scrolling feature of the list view. + getListView().setNestedScrollingEnabled(true); + } + @Override public boolean onOptionsItemSelected(MenuItem menuItem) { int id = menuItem.getItemId(); -- cgit v1.2.3-59-g8ed1b