From 13e61900cd9488f0aee33997b23c4087b0c635b7 Mon Sep 17 00:00:00 2001 From: nebkat Date: Sat, 17 Mar 2012 19:37:38 +0000 Subject: DeleteDropTarget: "Cancel" when dragging from AllApps Change-Id: I4fb03b0cbffe9662bcf6c582fe5bfb5bbbcac20e --- src/com/cyanogenmod/trebuchet/DeleteDropTarget.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'src/com/cyanogenmod/trebuchet/DeleteDropTarget.java') 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); -- cgit v1.2.3