commit cea3ed48e59a8288fbd7cc49303d7680d9db977f
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Apr 22 23:39:11 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 22 23:39:11 2020 +0000
tree f17cfc21a957b20b4a20796545ad158aae17684a
parent 2309597c9aa28c7d49fb97fc246d04a1ef5731bf
parent 9df3f0cebf40c2dfc8102de303364657ec3f68d1

Merge "Stop computing scroll if handler is invalidated" 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 bf01780..52b40a9 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java
@@ -1077,7 +1077,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);
         }