summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/DragController.java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2011-07-01 15:35:26 -0700
committerWinson Chung <winsonc@google.com>2011-07-06 20:48:45 -0700
commitc07918d0053fc7d2a19d7b013565a5d2e7d4af51 (patch)
tree1fe589183691f04dcc6d2a280e283d49faa6f6e7 /src/com/android/launcher2/DragController.java
parentd044526d82e7938cf35b296978d9d5302f98b4af (diff)
downloadandroid_packages_apps_Trebuchet-c07918d0053fc7d2a19d7b013565a5d2e7d4af51.tar.gz
android_packages_apps_Trebuchet-c07918d0053fc7d2a19d7b013565a5d2e7d4af51.tar.bz2
android_packages_apps_Trebuchet-c07918d0053fc7d2a19d7b013565a5d2e7d4af51.zip
Cleaning up some spring-loaded related dragging code. Allow cancel spring loaded mode.
Change-Id: Ie1f0468c563bed7abc1aa6416e222cdb0853c03a
Diffstat (limited to 'src/com/android/launcher2/DragController.java')
-rw-r--r--src/com/android/launcher2/DragController.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java
index ca72ce937..9a6335bce 100644
--- a/src/com/android/launcher2/DragController.java
+++ b/src/com/android/launcher2/DragController.java
@@ -366,7 +366,9 @@ public class DragController {
*/
public void cancelDrag() {
if (mDragging) {
- // Should we also be calling onDragExit() here?
+ if (mLastDropTarget != null) {
+ mLastDropTarget.onDragExit(mDragObject);
+ }
mDragObject.dragComplete = true;
mDragObject.dragSource.onDropCompleted(null, mDragObject, false);
}