Merge "Don't stash immediately when drag was canceled" into udc-dev
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java
index 6c9ab0c..66a903b 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarDragController.java
@@ -457,9 +457,12 @@
mControllers.taskbarAutohideSuspendController.updateFlag(
TaskbarAutohideSuspendController.FLAG_AUTOHIDE_SUSPEND_DRAGGING, false);
mActivity.onDragEnd();
- // Note, this must be done last to ensure no AutohideSuspendFlags are active, as that
- // will prevent us from stashing until the timeout.
- mControllers.taskbarStashController.updateAndAnimateTransientTaskbar(true);
+ if (mReturnAnimator == null) {
+ // Upon successful drag, immediately stash taskbar.
+ // Note, this must be done last to ensure no AutohideSuspendFlags are active, as
+ // that will prevent us from stashing until the timeout.
+ mControllers.taskbarStashController.updateAndAnimateTransientTaskbar(true);
+ }
}
}
@@ -493,8 +496,9 @@
callOnDragEnd();
dragView.remove();
dragView.clearAnimation();
+ // Do this after callOnDragEnd(), because we use mReturnAnimator != null to
+ // imply the drag was canceled rather than successful.
mReturnAnimator = null;
-
}
});
mReturnAnimator.start();
@@ -556,6 +560,8 @@
syncGroup.add(viewRoot, null /* runnable */);
syncGroup.addTransaction(transaction);
syncGroup.markSyncReady();
+ // Do this after maybeOnDragEnd(), because we use mReturnAnimator != null to imply
+ // the drag was canceled rather than successful.
mReturnAnimator = null;
}
});