| commit | 3c2956abcceca11d585093017775003546123c1a | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Apr 22 18:19:35 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 22 18:19:35 2022 +0000 |
| tree | 7b941ff2b691e7bd10490f99814233c03b8d9d75 | |
| parent | a053005db5ce56016ba204cc83a2cabd16b7fdd6 [diff] | |
| parent | 0e46bac72fd8f88728e075da7678a4decb8009cb [diff] |
Merge "Reset touch state when removing all tasks in RecentsView.applyLoadPlan" into tm-dev am: 37fa1392ec am: 0e46bac72f Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17586926 Change-Id: I0303221c25206ae054099019d0426b40794cfd73 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index 5f715f8..49bf827 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1396,6 +1396,9 @@ if (taskGroups == null || taskGroups.isEmpty()) { removeTasksViewsAndClearAllButton(); onTaskStackUpdated(); + // With all tasks removed, touch handling in PagedView is disabled and we need to reset + // touch state or otherwise values will be obsolete. + resetTouchState(); return; }
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index f5ac359..0a1d25c 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java
@@ -1440,7 +1440,7 @@ return Math.abs(velocity) > threshold; } - private void resetTouchState() { + protected void resetTouchState() { releaseVelocityTracker(); mIsBeingDragged = false; mActivePointerId = INVALID_POINTER;