commit 0060f8c6af5c795f55e1ab5fb2cde8e2c269c0eb
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 29 22:53:04 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Apr 29 22:53:04 2021 +0000
tree a2a650e5da35359226ccc3df08c27aeb4965e56f
parent 08710d82e730a3d8f104b315710e54c7cf066b06
parent ef261bc78b6dcf0c44cae41ec33d6b00885a61a5

Merge "Calling pageTransisionEnd only after edgeEffect finishes" into sc-dev am: 44e6fb6ed4 am: ef261bc78b

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14355769

Change-Id: Ic71648635025a7258f1a27d65553dcc0d7488fbc

src/com/android/launcher3/PagedView.java

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