commit 68fcf6fcf549a29b32adeb3adb49e34825a70654
author Tony Wickham <twickham@google.com> Mon Apr 27 18:07:49 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Apr 27 18:07:49 2020 +0000
tree 96bdacd5dffe6f80bdde124b8672528702d2329f
parent 953ebebdb3ded256552fbb1d94feb6f4207f07e2
parent 6d4b92fd52b878ab53c90e618017ccd1d34dcf6f

Stop computing scroll if handler is invalidated am: 3d05148750 am: 97653b65c4 am: 6d4b92fd52

Change-Id: I6e06be97bb5f673d17874f95b0ba2b3cb20c5021

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 5a64382..6598971 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java
@@ -1076,7 +1076,8 @@
     }
 
     private void continueComputingRecentsScrollIfNecessary() {
-        if (!mGestureState.hasState(STATE_RECENTS_SCROLLING_FINISHED)) {
+        if (!mGestureState.hasState(STATE_RECENTS_SCROLLING_FINISHED)
+                && !mStateCallback.hasStates(STATE_HANDLER_INVALIDATED)) {
             computeRecentsScrollIfInvisible();
             mRecentsView.post(this::continueComputingRecentsScrollIfNecessary);
         }