From 9d8eeabfecb85ce88f492f9960c1b68d086528a2 Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Tue, 5 Apr 2022 17:13:56 +0100
Subject: [PATCH] Reset touch state when removing all tasks in
 RecentsView.applyLoadPlan

Fix: 223245248
Test: com.android.quickstep.FallbackRecentsTest#goToOverviewFromHome
Change-Id: I1cc8952e077b9cc79a93d909b80e215e61e8deab
---
 quickstep/src/com/android/quickstep/views/RecentsView.java | 3 +++
 src/com/android/launcher3/PagedView.java                   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 25f8f01a3b..4317d55c33 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1390,6 +1390,9 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
         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 1eb493bf13..94f0ed7270 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1441,7 +1441,7 @@ public abstract class PagedView<T extends View & PageIndicator> extends ViewGrou
         return Math.abs(velocity) > threshold;
     }
 
-    private void resetTouchState() {
+    protected void resetTouchState() {
         releaseVelocityTracker();
         mIsBeingDragged = false;
         mActivePointerId = INVALID_POINTER;