commit 8d7bc38c3454893e1019bc62a26a87fbf25b5cd7
author Jonathan Miranda <jonmiranda@google.com> Sat May 01 14:00:41 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat May 01 14:00:41 2021 +0000
tree ffc973312ff823aa5a7f53873b530f2a1ad5adcf
parent b745a2a9fdb47c656817de8233746f0015ad34b1
parent 242c805f8269d65391f257deb062969910f791b6

Merge "Use color extraction for arrow popup." into sc-dev

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