commit 0ccbd7334c792b00b0beb3fc9e18c2c06b875042
author Brian Isganitis <brianji@google.com> Mon Nov 21 19:04:04 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 21 19:04:04 2022 +0000
tree 65f8bd29a29d4cc07f7f00b92d0d7a9a890f1eaf
parent 455eca41becec1dec2005b2c1be5f89bedafc17b
parent 4ff301eb9d4e67e68f076f25249a1e4b83211ac6

Merge "Do not start drag from pre-drag if cancelled during animation." into tm-qpr-dev

quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java
index dfff7ee..a26f5e5 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java
@@ -207,8 +207,13 @@
 
                     if (FeatureFlags.ENABLE_TASKBAR_POPUP_MENU.get()
                             && !shouldStartDrag(0)) {
-                        // Immediately close the popup menu.
-                        mDragView.setOnAnimationEndCallback(() -> callOnDragStart());
+                        mDragView.setOnAnimationEndCallback(() -> {
+                            // Drag might be cancelled during the DragView animation, so check
+                            // mIsPreDrag again.
+                            if (mIsInPreDrag) {
+                                callOnDragStart();
+                            }
+                        });
                     }
                 }