Merge "Stash transient taskbar upon icon drag" into tm-qpr-dev (793c3715) · Commits · e / os / android_packages_apps_Trebuchet

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -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);
		}