Merge "Stash transient taskbar upon icon drag" into tm-qpr-dev am: 793c37153a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20490352

Change-Id: I26e1675d9832f5c80c430450698a908e93951e1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ikram Gabiyev
2022-11-19 02:27:13 +00:00
committed by Automerger Merge Worker

View File

@@ -305,6 +305,9 @@ public class TaskbarDragController extends DragController<BaseTaskbarContext> im
if (mDisallowGlobalDrag) {
AbstractFloatingView.closeAllOpenViewsExcept(mActivity, TYPE_TASKBAR_ALL_APPS);
} else {
// stash the transient taskbar
mControllers.taskbarStashController.updateAndAnimateTransientTaskbar(true);
AbstractFloatingView.closeAllOpenViews(mActivity);
}
@@ -413,6 +416,9 @@ public class TaskbarDragController extends DragController<BaseTaskbarContext> im
if (dragEvent.getResult()) {
maybeOnDragEnd();
} else {
// un-stash the transient taskbar in case drag and drop was canceled
mControllers.taskbarStashController.updateAndAnimateTransientTaskbar(false);
// This will take care of calling maybeOnDragEnd() after the animation
animateGlobalDragViewToOriginalPosition(btv, dragEvent);
}