Merge "Reducing the no-intercept area to widget picker recycler view" into tm-qpr-dev
diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
index 72ec629..220d1c1 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java
@@ -615,12 +615,13 @@
// 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()