commit 50d2fad5f2cff4af7cb08bbfa6b79278dd41590b
author Tony Wickham <twickham@google.com> Thu Mar 21 22:03:18 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 21 22:03:18 2024 +0000
tree 793b6c4da6a09e068d98444cbee509a25a6768de
parent eccda6f3632e4120281fb54759982cc2842e0635
parent 3c58551e12fe00802186c29a1ac7899e5609702d

Merge "Cancel animations after reading MotionPauseDetector#isPaused()" into 24D1-dev

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