commit 85a939d399a3ae8ec136fb806e2a96997e55f3ac
author Tony Wickham <twickham@google.com> Tue May 05 23:48:51 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue May 05 23:48:51 2020 +0000
tree 061ea26b0a41fbf6aa43818c88f96d8ef3390f51
parent 1933b2abe981e6b4ca125513cbde346044f97b25
parent 2fbd70b44dd63afa5f25576c55268ad99311ffc6

Fix continueComputingRecentsScrollIfNecessary() running infinitely am: aa2af22da8 am: 60be99b514 am: 2fbd70b44d

Change-Id: I6a75fb6cce5866ffa37585efaba517313d0a4680

quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java
index 52b40a9..e4f45b3 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java
@@ -1078,9 +1078,10 @@
 
     private void continueComputingRecentsScrollIfNecessary() {
         if (!mGestureState.hasState(STATE_RECENTS_SCROLLING_FINISHED)
-                && !mStateCallback.hasStates(STATE_HANDLER_INVALIDATED)) {
+                && !mStateCallback.hasStates(STATE_HANDLER_INVALIDATED)
+                && !mCanceled) {
             computeRecentsScrollIfInvisible();
-            mRecentsView.post(this::continueComputingRecentsScrollIfNecessary);
+            mRecentsView.postOnAnimation(this::continueComputingRecentsScrollIfNecessary);
         }
     }