DeleteDropTarget: "Cancel" when dragging from AllApps

Change-Id: I4fb03b0cbffe9662bcf6c582fe5bfb5bbbcac20e

2 files changed, 15 insertions, 2 deletions

diff --git a/res/values/strings.xml b/res/values/strings.xml
index ee8a257af..0acbe2daa 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -118,6 +118,8 @@ s -->
 
     <!-- Label for delete drop target. [CHAR_LIMIT=30] -->
     <string name="delete_target_label">Remove</string>
+    <!-- Label for cancel drop target. [CHAR_LIMIT=30] -->
+    <string name="cancel_target_label">Cancel</string>
     <!-- Label for uninstall drop target. [CHAR_LIMIT=30]-->
     <string name="delete_target_uninstall_label">Uninstall</string>
     <!-- Label for the info icon. [CHAR_LIMIT=30] -->
diff --git a/src/com/cyanogenmod/trebuchet/DeleteDropTarget.java b/src/com/cyanogenmod/trebuchet/DeleteDropTarget.java
index 7c23677cb..e7efaef9b 100644
--- a/src/com/cyanogenmod/trebuchet/DeleteDropTarget.java
+++ b/src/com/cyanogenmod/trebuchet/DeleteDropTarget.java
@@ -88,6 +88,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 AppsCustomizeView) && (info instanceof ApplicationInfo);
     }
@@ -143,7 +146,11 @@ public class DeleteDropTarget extends ButtonDropTarget {
         setTextColor(mOriginalTextColor);
         ((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);
+            }
         }
     }
 
@@ -191,7 +198,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);