Merge "Do not start drag from pre-drag if cancelled during animation." into tm-qpr-dev am: 0ccbd7334c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20522179 Change-Id: I19f12060d771c4121642a5dbaf8ccdd291795a66 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user