| commit | 183f6b295644128e9bfc7dfd31989bb871d0986c | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Apr 22 23:50:22 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 22 23:50:22 2020 +0000 |
| tree | 2e7f2587ec07d574ef84211bbffea05e96f03c4e | |
| parent | a9eb5926002a47e3b554b57e4aa9c029392b5cdd [diff] | |
| parent | cea3ed48e59a8288fbd7cc49303d7680d9db977f [diff] |
Merge "Stop computing scroll if handler is invalidated" into ub-launcher3-rvc-dev am: cea3ed48e5 Change-Id: I90c97b7f14cdf8f41520a7fa1154284c01598194
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); }