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

Commit 76dbf6fa authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Fixing onPageBeginTransition not being called when scrolling overlay 

Bug: 33693546
Change-Id: If212a196648fbb2c725ca4800a157ec24f278ca8
parent bf8a265d

src/com/android/launcher3/PagedView.java

+2 −1
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc 
    protected boolean computeScrollHelper(boolean shouldInvalidate) {

        if (mScroller.computeScrollOffset()) {

            // Don't bother scrolling if the page does not need to be moved

            if (getScrollX() != mScroller.getCurrX()

            if (getUnboundedScrollX() != mScroller.getCurrX()

                    || getScrollY() != mScroller.getCurrY()) {

                float scaleX = mFreeScroll ? getScaleX() : 1f;

                int scrollX = (int) (mScroller.getCurrX() * (1 / scaleX));
@@ -1945,6 +1945,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc 
        // Trigger a compute() to finish switching pages if necessary

        if (immediate) {

            computeScroll();

            pageEndTransition();

        }



        invalidate();

src/com/android/launcher3/Workspace.java

+2 −4
Original line number Diff line number Diff line
@@ -1386,12 +1386,10 @@ public class Workspace extends PagedView 
        // it's own settling, and every gesture to the overlay should be self-contained and start

        // from 0, so we zero it out here.

        if (isScrollingOverlay()) {

            int finalScroll = mIsRtl ? mMaxScrollX : 0;



            // We reset mWasInOverscroll so that PagedView doesn't zero out the overscroll

            // interaction when we call scrollTo.

            // interaction when we call snapToPageImmediately.

            mWasInOverscroll = false;

            scrollTo(finalScroll, getScrollY());

            snapToPageImmediately(0);

        } else {

            super.snapToDestination();

        }