commit dfe50510642a9a2ab788451034079b9520efe6b8
author Daniel Chapin <chapin@google.com> Fri Apr 30 18:08:09 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Apr 30 18:31:23 2021 +0000
tree 89270308ed3329eacef55dbe2b57c3d2f2c5dbfc
parent 11ff08419652fba2d9fa7c210022f3f9f90ff041

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

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index f7de3ca..c9cc372 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -388,8 +388,7 @@
     }
 
     protected void pageEndTransition() {
-        if (mIsPageInTransition && !mIsBeingDragged && mScroller.isFinished()
-                && mEdgeGlowLeft.isFinished() && mEdgeGlowRight.isFinished()) {
+        if (mIsPageInTransition) {
             mIsPageInTransition = false;
             onPageEndTransition();
         }
@@ -1741,7 +1740,6 @@
     public void draw(Canvas canvas) {
         super.draw(canvas);
         drawEdgeEffect(canvas);
-        pageEndTransition();
     }
 
     protected void drawEdgeEffect(Canvas canvas) {