diff options
| author | nebkat <nebkat@teamhacksung.org> | 2012-03-17 19:37:38 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2012-11-19 01:21:04 +0000 |
| commit | 6075c92995548d50f54e72d5c5f3c03ba3c31a08 (patch) | |
| tree | a4fe42f37507719d3de0e412d6f5b5d25fa8e5f0 /src | |
| parent | 2bbba4784c25a56fadb37c44c4e8a9cf8aed0e4f (diff) | |
| download | android_packages_apps_Trebuchet-6075c92995548d50f54e72d5c5f3c03ba3c31a08.tar.gz android_packages_apps_Trebuchet-6075c92995548d50f54e72d5c5f3c03ba3c31a08.tar.bz2 android_packages_apps_Trebuchet-6075c92995548d50f54e72d5c5f3c03ba3c31a08.zip | |
DeleteDropTarget: "Cancel" when dragging from AllApps
Change-Id: I4fb03b0cbffe9662bcf6c582fe5bfb5bbbcac20e
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/DeleteDropTarget.java | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/com/cyanogenmod/trebuchet/DeleteDropTarget.java b/src/com/cyanogenmod/trebuchet/DeleteDropTarget.java index 858bbe15a..526139473 100644 --- a/src/com/cyanogenmod/trebuchet/DeleteDropTarget.java +++ b/src/com/cyanogenmod/trebuchet/DeleteDropTarget.java @@ -97,6 +97,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); } @@ -171,7 +174,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); + } } } @@ -220,7 +227,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); |