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

Commit d7285795 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "resolve merge conflicts of 3a22956f to...

Merge "resolve merge conflicts of 3a22956f to ub-launcher3-master" into ub-launcher3-master
parents f3bc7971 1a965c19
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -2354,7 +2354,14 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
        if (pageIndex == -1) {
            return 0;
        }
        return getScrollForPage(pageIndex) - mOrientationHandler.getPrimaryScroll(this);
        // Unbound the scroll (due to overscroll) if the adjacent tasks are offset away from it.
        // This allows the page to move freely, given there's no visual indication why it shouldn't.
        int boundedScroll = mOrientationHandler.getPrimaryScroll(this);
        int unboundedScroll = getUnboundedScroll();
        float unboundedProgress = mAdjacentPageOffset;
        int scroll = Math.round(unboundedScroll * unboundedProgress
                + boundedScroll * (1 - unboundedProgress));
        return getScrollForPage(pageIndex) - scroll;
    }

    public Consumer<MotionEvent> getEventDispatcher(float navbarRotation) {