commit 1d023ef2f4db3c9e5888b4fdbd1fd87aeb666582
author Sunny Goyal <sunnygoyal@google.com> Sat May 01 01:47:20 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat May 01 01:47:20 2021 +0000
tree db408cb7323e72232fc750d8ab60581b03ec49bd
parent 4b1fe698be1712c7744e9bbe07a3abe31bde754d
parent b745a2a9fdb47c656817de8233746f0015ad34b1

Fixing transition end not getting called if pagedView is not drawing am: b745a2a9fd

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

Change-Id: I54f8d638b19e36745dcd7faa3474282789e71f6e

src/com/android/launcher3/PagedView.java

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index f7de3ca..fb21698 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -389,12 +389,18 @@
 
     protected void pageEndTransition() {
         if (mIsPageInTransition && !mIsBeingDragged && mScroller.isFinished()
-                && mEdgeGlowLeft.isFinished() && mEdgeGlowRight.isFinished()) {
+                && (!isShown() || (mEdgeGlowLeft.isFinished() && mEdgeGlowRight.isFinished()))) {
             mIsPageInTransition = false;
             onPageEndTransition();
         }
     }
 
+    @Override
+    public void onVisibilityAggregated(boolean isVisible) {
+        pageEndTransition();
+        super.onVisibilityAggregated(isVisible);
+    }
+
     protected boolean isPageInTransition() {
         return mIsPageInTransition;
     }