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

Commit ce6aeca4 authored by Andy Wickham's avatar Andy Wickham Committed by Automerger Merge Worker
Browse files

Merge "Don't move down all apps container when touching near scroll bar." into... 

Merge "Don't move down all apps container when touching near scroll bar." into tm-qpr-dev am: 30c2bdda am: c5f8dff8

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22342811



Change-Id: Idbd08d300cb38d13b0b1a44507fe2d0f8356ecf8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2db3db26 c5f8dff8

src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java

+8 −10
Original line number Diff line number Diff line
@@ -358,16 +358,10 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext> 


    public boolean shouldContainerScroll(MotionEvent ev) {

        BaseDragLayer dragLayer = mActivityContext.getDragLayer();

        // IF the MotionEvent is inside the search box, and the container keeps on receiving

        // touch input, container should move down.

        if (dragLayer.isEventOverView(mSearchContainer, ev)) {

            return true;

        }

        // Scroll if not within the container view (e.g. over large-screen scrim).

        if (!dragLayer.isEventOverView(getVisibleContainerView(), ev)) {

            return true;

        }

        if (dragLayer.isEventOverView(mBottomSheetHandleArea, ev)) {

        // IF the MotionEvent is inside the search box or handle area, and the container keeps on

        // receiving touch input, container should move down.

        if (dragLayer.isEventOverView(mSearchContainer, ev)

                || dragLayer.isEventOverView(mBottomSheetHandleArea, ev)) {

            return true;

        }

        AllAppsRecyclerView rv = getActiveRecyclerView();
@@ -379,6 +373,10 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext> 
                && dragLayer.isEventOverView(rv.getScrollbar(), ev)) {

            return false;

        }

        // Scroll if not within the container view (e.g. over large-screen scrim).

        if (!dragLayer.isEventOverView(getVisibleContainerView(), ev)) {

            return true;

        }

        return rv.shouldContainerScroll(ev, dragLayer);

    }

src/com/android/launcher3/views/RecyclerViewFastScroller.java

+1 −0
Original line number Diff line number Diff line
@@ -333,6 +333,7 @@ public class RecyclerViewFastScroller extends View { 
        }

    }



    @Override

    public void onDraw(Canvas canvas) {

        if (mThumbOffsetY < 0 || mRv == null) {

            return;