diff options
| author | Tony Wickham <twickham@google.com> | 2015-10-01 13:04:22 -0700 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2015-10-05 10:58:15 -0700 |
| commit | 9aae47f8a6e23f1805ee3d44512fc1f80286e6dd (patch) | |
| tree | d27a147f70bcea483fd3e15917a0145a7997d7b4 /src/com/android/launcher3/dragndrop/DragController.java | |
| parent | b99d74bb0589dcbaf8167af60fd29be0b42f3139 (diff) | |
| download | android_packages_apps_Trebuchet-9aae47f8a6e23f1805ee3d44512fc1f80286e6dd.tar.gz android_packages_apps_Trebuchet-9aae47f8a6e23f1805ee3d44512fc1f80286e6dd.tar.bz2 android_packages_apps_Trebuchet-9aae47f8a6e23f1805ee3d44512fc1f80286e6dd.zip | |
Added 'Cancel' drop target from all apps and widget picker.
- Reuse DeleteDropTarget since it's the same effect, but with "Cancel"
instead of "Remove" if supportsDeleteDropTarget() returns false.
- Rename related strings (but not their values)
Bug: 24104015
Bug: 24099531
Change-Id: Ia9fbcaa17bb17f7aa31df1f830298da01544c178
Diffstat (limited to 'src/com/android/launcher3/dragndrop/DragController.java')
| -rw-r--r-- | src/com/android/launcher3/dragndrop/DragController.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/com/android/launcher3/dragndrop/DragController.java b/src/com/android/launcher3/dragndrop/DragController.java index 3aed4b65d..a4bd753ff 100644 --- a/src/com/android/launcher3/dragndrop/DragController.java +++ b/src/com/android/launcher3/dragndrop/DragController.java @@ -455,9 +455,6 @@ public class DragController implements DragDriver.EventListener { dropTarget = dropTargetOverride; } else { vec = isFlingingToDelete(mDragObject.dragSource); - if (!DeleteDropTarget.supportsDrop(mDragObject.dragInfo)) { - vec = null; - } if (vec != null) { dropTarget = mFlingToDeleteDropTarget; } else { |