commit c0535b23f6b7de9b67fc20ffdb9717629d5ca1f6
author Tony Wickham <twickham@google.com> Tue May 05 17:14:03 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 05 17:14:03 2020 +0000
tree ef1eabf675de41d0c7cf4c5af6c4275ea126b824
parent cf19a92cde14e2d9ba4ca66e91d41d22c4446fbd
parent 49b57e955c4cb37e91db77cc4813dd59eaacdc70

Merge "Fix continueComputingRecentsScrollIfNecessary() running infinitely" into ub-launcher3-rvc-dev

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 1f78857..633bd13 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java
@@ -1081,9 +1081,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);
         }
     }