DeleteDropTarget: "Cancel" when dragging from AllApps

Change-Id: I4fb03b0cbffe9662bcf6c582fe5bfb5bbbcac20e

1 files changed, 13 insertions, 2 deletions

diff --git a/src/com/cyanogenmod/trebuchet/DeleteDropTarget.java b/src/com/cyanogenmod/trebuchet/DeleteDropTarget.java
index a8cf54c35..5d2a57c6d 100644
--- a/src/com/cyanogenmod/trebuchet/DeleteDropTarget.java
+++ b/src/com/cyanogenmod/trebuchet/DeleteDropTarget.java
@@ -98,6 +98,9 @@ public class DeleteDropTarget extends ButtonDropTarget {
         }
     }
 
+    private boolean isAllAppsItem(DragSource source, Object info) {
+        return isAllAppsApplication(source, info) || isAllAppsWidget(source, info);
+    }
     private boolean isAllAppsApplication(DragSource source, Object info) {
         return (source instanceof AppsCustomizePagedView) && (info instanceof ApplicationInfo);
     }
@@ -172,7 +175,11 @@ public class DeleteDropTarget extends ButtonDropTarget {
         resetHoverColor();
         ((ViewGroup) getParent()).setVisibility(View.VISIBLE);
         if (getText().length() > 0) {
-            setText(R.string.delete_target_label);
+            if (isAllAppsItem(source, info)) {
+                setText(R.string.cancel_target_label);
+            } else {
+                setText(R.string.delete_target_label);
+            }
         }
     }
 
@@ -221,7 +228,11 @@ public class DeleteDropTarget extends ButtonDropTarget {
             mMode = MODE_DELETE;
 
             if (getText().length() > 0) {
-                setText(R.string.delete_target_label);
+                if (isAllAppsItem(d.dragSource, d.dragInfo)) {
+                    setText(R.string.cancel_target_label);
+                } else {
+                    setText(R.string.delete_target_label);
+                }
             }
 
             setCompoundDrawablesWithIntrinsicBounds(mRemoveNormalDrawable, null, null, null);