commit c6cc4639d1f648eced9c3e4ccb5bf24c70e665e0
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jan 19 14:56:10 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 19 14:56:10 2022 +0000
tree b132f620c6ac6bfed57c275aa85f40d8b87b7921
parent b72fc095a30c3b45fa1506df52d3b50da628c9f7
parent 4e3b453baf2ad1723e2cf7b27d2f77f3fae57aed

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

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

Change-Id: Id5310dbc54ff4c797362982d0641fbda6d23a6bc

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

diff --git a/core/java/com/android/internal/app/LocalePickerWithRegion.java b/core/java/com/android/internal/app/LocalePickerWithRegion.java
index d0719ee..b4ae56f 100644
--- a/core/java/com/android/internal/app/LocalePickerWithRegion.java
+++ b/core/java/com/android/internal/app/LocalePickerWithRegion.java
@@ -159,6 +159,14 @@
     }
 
     @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) {