commit 73c33f7bc18351c4aff37dbf66d9db94284d5bcb
author android-build-team Robot <android-build-team-robot@google.com> Fri Apr 30 18:31:30 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Apr 30 18:31:30 2021 +0000
tree 89270308ed3329eacef55dbe2b57c3d2f2c5dbfc
parent 11ff08419652fba2d9fa7c210022f3f9f90ff041
parent dfe50510642a9a2ab788451034079b9520efe6b8

Merge cherrypicks of [14389499, 14389633, 14389588] into sc-v2-release

Change-Id: I40529471e1543264daaf78e546b7035a793390b1

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) {