From dfe50510642a9a2ab788451034079b9520efe6b8 Mon Sep 17 00:00:00 2001 From: Daniel Chapin Date: Fri, 30 Apr 2021 18:08:09 +0000 Subject: [PATCH] Revert "Calling pageTransisionEnd only after edgeEffect finishes" This reverts commit 05b59c080fe78236bfab817a8fbd2f383bc1d8fd. Reason for revert: DF blocking Bug:186822776 Change-Id: Ia4e6168459907f6ed9eb6e22f5497eff3e1ea297 (cherry picked from commit 189d92c3d531311cbcf9e8eaead0f24b98194325) --- src/com/android/launcher3/PagedView.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index f7de3cac71..c9cc3721a8 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -388,8 +388,7 @@ public abstract class PagedView extends ViewGrou } protected void pageEndTransition() { - if (mIsPageInTransition && !mIsBeingDragged && mScroller.isFinished() - && mEdgeGlowLeft.isFinished() && mEdgeGlowRight.isFinished()) { + if (mIsPageInTransition) { mIsPageInTransition = false; onPageEndTransition(); } @@ -1741,7 +1740,6 @@ public abstract class PagedView extends ViewGrou public void draw(Canvas canvas) { super.draw(canvas); drawEdgeEffect(canvas); - pageEndTransition(); } protected void drawEdgeEffect(Canvas canvas) {