Merge "Enable nested scrolling for locale picker" into sc-v2-dev am: 67e26d7469

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

Change-Id: Id0a594a3f00e9a2cafdced22c62ab9d8238d494b

1 files changed, 8 insertions, 0 deletions

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
@@ -159,6 +159,14 @@ public class LocalePickerWithRegion extends ListFragment implements SearchView.O
     }
 
     @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();
         switch (id) {