commit aba41128226cafbebdecebbc24f3bb64756a4cd4
author Sunny Goyal <sunnygoyal@google.com> Sat May 01 01:48:31 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat May 01 01:48:31 2021 +0000
tree 951d4a61403a5467c5a8ebfb7b6cfb50acd90683
parent 86e6c14721726d324b09be68d83816e02efd5efe
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: I89ef18e86c06126963928cbb6358f7f4bdcad0a8

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;
     }