commit 365c3c8f091597dd0a606e3da7f5784eae1d02de
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Mar 24 19:34:50 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 24 19:34:50 2021 +0000
tree cbd8778fb025741e5cfe55f0bafb8e3cdd9f767e
parent 0249710308883c3c76a6becd6e7d731ba6039bbf
parent 02c4f65e67a30d7d3baaba7f7dd4aedfe7416bed

Merge "Fix scrolling in WidgetsBottomSheet" into sc-dev

src/com/android/launcher3/widget/WidgetsBottomSheet.java

diff --git a/src/com/android/launcher3/widget/WidgetsBottomSheet.java b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
index 2fda86c..bbb0d92 100644
--- a/src/com/android/launcher3/widget/WidgetsBottomSheet.java
+++ b/src/com/android/launcher3/widget/WidgetsBottomSheet.java
@@ -26,6 +26,7 @@
 import android.util.Pair;
 import android.view.Gravity;
 import android.view.LayoutInflater;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.Interpolator;
@@ -152,6 +153,19 @@
         });
     }
 
+    @Override
+    public boolean onControllerInterceptTouchEvent(MotionEvent ev) {
+        if (ev.getAction() == MotionEvent.ACTION_DOWN) {
+            mNoIntercept = false;
+            ScrollView scrollView = findViewById(R.id.widgets_table_scroll_view);
+            if (getPopupContainer().isEventOverView(scrollView, ev)
+                    && scrollView.getScrollY() > 0) {
+                mNoIntercept = true;
+            }
+        }
+        return super.onControllerInterceptTouchEvent(ev);
+    }
+
     protected WidgetCell addItemCell(ViewGroup parent) {
         WidgetCell widget = (WidgetCell) LayoutInflater.from(getContext())
                 .inflate(R.layout.widget_cell, parent, false);