Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ccbd733 authored by Brian Isganitis's avatar Brian Isganitis Committed by Android (Google) Code Review
Browse files

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

parents 455eca41 4ff301eb
Loading
Loading
Loading
Loading
+7 −2
Original line number Diff line number Diff line
@@ -207,8 +207,13 @@ public class TaskbarDragController extends DragController<BaseTaskbarContext> im

                    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();
                            }
                        });
                    }
                }