| commit | 0e46bac72fd8f88728e075da7678a4decb8009cb | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Apr 22 17:53:48 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 22 17:53:48 2022 +0000 |
| tree | 89af499877c835a4a5bd84f881fcb78a1d9362fe | |
| parent | a6f8f854368f1f2fef65097ce656d47d33a45452 [diff] | |
| parent | 37fa1392ecbb977df1f1d3979a5f7acd1cd28098 [diff] |
Merge "Reset touch state when removing all tasks in RecentsView.applyLoadPlan" into tm-dev am: 37fa1392ec Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17586926 Change-Id: Ie2e30df6666338626d6d4575ac68572dba305c43 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;