commit a51a330e955132b497e3d691542f936d74ce8ec9
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Mar 20 01:17:02 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Mar 20 01:17:02 2024 +0000
tree b3f67c1c3d63e2386f4bc5da302f0962576bbd9a
parent df4f4233b953017eb55276b9624047a96ac3ed63
parent f027b4eb369d70446e8d4b82cfc320ee52f3e64d

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26621456'] into 24Q2-release.

Change-Id: I79e949cad4d4e9e3fb06f81f8a12a21b5ecd7f5c

quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java

diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
index a92e77a..3a1c42d 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NoButtonQuickSwitchTouchController.java
@@ -324,7 +324,6 @@
 
     @Override
     public void onDragEnd(PointF velocity) {
-        cancelAnimations();
         boolean horizontalFling = mSwipeDetector.isFling(velocity.x);
         boolean verticalFling = mSwipeDetector.isFling(velocity.y);
         boolean noFling = !horizontalFling && !verticalFling;
@@ -353,6 +352,7 @@
             return;
         }
         InteractionJankMonitorWrapper.cancel(Cuj.CUJ_LAUNCHER_APP_SWIPE_TO_RECENTS);
+        cancelAnimations();
 
         final LauncherState targetState;
         if (horizontalFling && verticalFling) {