From 1126f574412197d53dc9f70d50176a534245f336 Mon Sep 17 00:00:00 2001 From: Sihua Ma Date: Wed, 7 Dec 2022 11:11:52 -0800 Subject: [PATCH] Reducing the no-intercept area to widget picker recycler view This allows drag-to-exit on the bounding area even if the scroll is not on top Fix: 247121877 Test: Manual Change-Id: Iebf7af195b717bad5e80ee34fec05fed58827699 --- .../android/launcher3/widget/picker/WidgetsFullSheet.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java index 72ec62979e..220d1c1d55 100644 --- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java +++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java @@ -615,12 +615,13 @@ public class WidgetsFullSheet extends BaseWidgetSheet // Disable swipe down when recycler view is scrolling if (ev.getAction() == MotionEvent.ACTION_DOWN) { mNoIntercept = false; - RecyclerViewFastScroller scroller = getRecyclerView().getScrollbar(); + WidgetsRecyclerView recyclerView = getRecyclerView(); + RecyclerViewFastScroller scroller = recyclerView.getScrollbar(); if (scroller.getThumbOffsetY() >= 0 && getPopupContainer().isEventOverView(scroller, ev)) { mNoIntercept = true; - } else if (getPopupContainer().isEventOverView(mContent, ev)) { - mNoIntercept = !getRecyclerView().shouldContainerScroll(ev, getPopupContainer()); + } else if (getPopupContainer().isEventOverView(recyclerView, ev)) { + mNoIntercept = !recyclerView.shouldContainerScroll(ev, getPopupContainer()); } if (mSearchBar.isSearchBarFocused()