commit 6d4b92fd52b878ab53c90e618017ccd1d34dcf6f
author Tony Wickham <twickham@google.com> Mon Apr 27 17:50:26 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Apr 27 17:50:26 2020 +0000
tree 85ecd24ba8fc1f210a9f5cb475186488403d5b58
parent 718720e18d5f012315eda85c953f779de4a74433
parent 97653b65c43fea6cec8934936754af7a38572c63

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

Change-Id: Id4eecc6375827ce4725ff2ae705ea7908a15d867

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