diff options
| -rw-r--r-- | src/com/android/launcher2/DragController.java | 1 | ||||
| -rw-r--r-- | src/com/android/launcher2/DropTarget.java | 3 | ||||
| -rw-r--r-- | src/com/android/launcher2/Workspace.java | 3 |
3 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java index afbf80d17..ca7e55b64 100644 --- a/src/com/android/launcher2/DragController.java +++ b/src/com/android/launcher2/DragController.java @@ -361,6 +361,7 @@ public class DragController { if (mLastDropTarget != null) { mLastDropTarget.onDragExit(mDragObject); } + mDragObject.cancelled = true; mDragObject.dragComplete = true; mDragObject.dragSource.onDropCompleted(null, mDragObject, false); } diff --git a/src/com/android/launcher2/DropTarget.java b/src/com/android/launcher2/DropTarget.java index 34fa89316..4172da243 100644 --- a/src/com/android/launcher2/DropTarget.java +++ b/src/com/android/launcher2/DropTarget.java @@ -52,6 +52,9 @@ public interface DropTarget { /** Post drag animation runnable */ public Runnable postAnimationRunnable = null; + /** Indicates that the drag operation was cancelled */ + public boolean cancelled = false; + public DragObject() { } } diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 44c533b95..873c03841 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -3051,6 +3051,9 @@ public class Workspace extends SmoothPagedView } cellLayout.onDropChild(mDragInfo.cell); } + if (d.cancelled && mDragInfo.cell != null) { + mDragInfo.cell.setVisibility(VISIBLE); + } mDragOutline = null; mDragInfo = null; } |