commit d90674902e06eaedf349361bc9fb4b284f727888
author Winson Chung <winsonc@google.com> Tue Mar 06 10:49:12 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 06 10:49:12 2012 -0800
tree d7f8e5ca0d2c5c57443ef3550ea507ca554e9d52
parent 9949c8ba0e5766ecbd2dd897bccbde710eb922b9
parent 41bb19d2775836e30ebf42f681b4617bc71600aa

Merge "Always remove drag view immediately when cancelling drag. (Bug: 6119112)"

src/com/android/launcher2/DragController.java

diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java
index 129987f..019a749 100644
--- a/src/com/android/launcher2/DragController.java
+++ b/src/com/android/launcher2/DragController.java
@@ -351,6 +351,7 @@
             if (mLastDropTarget != null) {
                 mLastDropTarget.onDragExit(mDragObject);
             }
+            mDragObject.deferDragViewCleanupPostAnimation = false;
             mDragObject.cancelled = true;
             mDragObject.dragComplete = true;
             mDragObject.dragSource.onDropCompleted(null, mDragObject, false);