summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2012-03-06 10:49:12 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-06 10:49:12 -0800
commitd90674902e06eaedf349361bc9fb4b284f727888 (patch)
treed7f8e5ca0d2c5c57443ef3550ea507ca554e9d52
parent9949c8ba0e5766ecbd2dd897bccbde710eb922b9 (diff)
parent41bb19d2775836e30ebf42f681b4617bc71600aa (diff)
downloadandroid_packages_apps_Trebuchet-d90674902e06eaedf349361bc9fb4b284f727888.tar.gz
android_packages_apps_Trebuchet-d90674902e06eaedf349361bc9fb4b284f727888.tar.bz2
android_packages_apps_Trebuchet-d90674902e06eaedf349361bc9fb4b284f727888.zip
Merge "Always remove drag view immediately when cancelling drag. (Bug: 6119112)"
-rw-r--r--src/com/android/launcher2/DragController.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java
index 129987f00..019a749f2 100644
--- a/src/com/android/launcher2/DragController.java
+++ b/src/com/android/launcher2/DragController.java
@@ -351,6 +351,7 @@ public class DragController {
if (mLastDropTarget != null) {
mLastDropTarget.onDragExit(mDragObject);
}
+ mDragObject.deferDragViewCleanupPostAnimation = false;
mDragObject.cancelled = true;
mDragObject.dragComplete = true;
mDragObject.dragSource.onDropCompleted(null, mDragObject, false);