From 9aae47f8a6e23f1805ee3d44512fc1f80286e6dd Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Thu, 1 Oct 2015 13:04:22 -0700
Subject: 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
---
 src/com/android/launcher3/dragndrop/DragController.java | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src/com/android/launcher3/dragndrop/DragController.java')

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 {
-- 
cgit v1.2.3