diff options
author | Winson Chung <winsonc@google.com> | 2012-03-20 16:19:37 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2012-03-22 13:00:16 -0700 |
commit | a48487a814c07a9f1f45eb3ffe3d873b3dc31b3b (patch) | |
tree | 78c04603c91e5488a323167d50c0823795cb18c2 /src/com/android/launcher2/DragController.java | |
parent | 6f8cb5201da1813e25cc719ff3570f6cecd44800 (diff) | |
download | android_packages_apps_Trebuchet-a48487a814c07a9f1f45eb3ffe3d873b3dc31b3b.tar.gz android_packages_apps_Trebuchet-a48487a814c07a9f1f45eb3ffe3d873b3dc31b3b.tar.bz2 android_packages_apps_Trebuchet-a48487a814c07a9f1f45eb3ffe3d873b3dc31b3b.zip |
Allow fling gesture while dragging from AllApps to dismiss drag.
Change-Id: I5eea14336579a1374aded63dda9ad1a33e8b8d4a
Diffstat (limited to 'src/com/android/launcher2/DragController.java')
-rw-r--r-- | src/com/android/launcher2/DragController.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java index 2a889257d..5a8617cfe 100644 --- a/src/com/android/launcher2/DragController.java +++ b/src/com/android/launcher2/DragController.java @@ -366,7 +366,7 @@ public class DragController { mDragObject.deferDragViewCleanupPostAnimation = false; mDragObject.cancelled = true; mDragObject.dragComplete = true; - mDragObject.dragSource.onDropCompleted(null, mDragObject, false); + mDragObject.dragSource.onDropCompleted(null, mDragObject, false, false); } endDrag(); } @@ -422,6 +422,10 @@ public class DragController { } } + void onDeferredEndFling(DropTarget.DragObject d) { + d.dragSource.onFlingToDeleteCompleted(); + } + /** * Clamps the position to the drag layer bounds. */ @@ -665,7 +669,7 @@ public class DragController { vel); accepted = true; } - mDragObject.dragSource.onDropCompleted((View) mFlingToDeleteDropTarget, mDragObject, + mDragObject.dragSource.onDropCompleted((View) mFlingToDeleteDropTarget, mDragObject, true, accepted); } @@ -684,7 +688,7 @@ public class DragController { accepted = true; } } - mDragObject.dragSource.onDropCompleted((View) dropTarget, mDragObject, accepted); + mDragObject.dragSource.onDropCompleted((View) dropTarget, mDragObject, false, accepted); } private DropTarget findDropTarget(int x, int y, int[] dropCoordinates) { |