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

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

Merge "Calling pageTransisionEnd only after edgeEffect finishes" into sc-dev

parents 14e20707 05b59c08

src/com/android/launcher3/PagedView.java

+3 −1
Original line number Diff line number Diff line
@@ -388,7 +388,8 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou 
    }



    protected void pageEndTransition() {

        if (mIsPageInTransition) {

        if (mIsPageInTransition && !mIsBeingDragged && mScroller.isFinished()

                && mEdgeGlowLeft.isFinished() && mEdgeGlowRight.isFinished()) {

            mIsPageInTransition = false;

            onPageEndTransition();

        }
@@ -1740,6 +1741,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou 
    public void draw(Canvas canvas) {

        super.draw(canvas);

        drawEdgeEffect(canvas);

        pageEndTransition();

    }



    protected void drawEdgeEffect(Canvas canvas) {