commit 4d22811f76eb0585b98923714e66f8a4e6da034b
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Mar 18 23:53:17 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 18 23:53:17 2024 +0000
tree 36de656b3910db189db7e89a07efc89c8a38a127
parent c2a6055768f3923aa0555a8b949ffd1e409bac74
parent 77802d6da48320e5f5cf5c420fe31a1aa14e478e

Merge "Cancel animations after reading MotionPauseDetector#isPaused()" into main

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) {