Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbaec70d authored by Sihua Ma's avatar Sihua Ma Committed by Android (Google) Code Review
Browse files

Merge "Reducing the no-intercept area to widget picker recycler view" into tm-qpr-dev

parents 8a7dc2b2 1126f574

src/com/android/launcher3/widget/picker/WidgetsFullSheet.java

+4 −3
Original line number Diff line number Diff line
@@ -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()