diff options
| author | Winson Chung <winsonc@google.com> | 2013-09-26 10:43:20 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2013-09-26 10:44:12 -0700 |
| commit | e01af631dc98fa3e97b01b4d3ac135cf7ca5917e (patch) | |
| tree | 850a48e5be25fb65d96c210bb86552aebdb5af7d /src/com/android/launcher3/DeleteDropTarget.java | |
| parent | 1b495f5298d4648adab0b24dca7a3bc5267bf710 (diff) | |
| download | android_packages_apps_Trebuchet-e01af631dc98fa3e97b01b4d3ac135cf7ca5917e.tar.gz android_packages_apps_Trebuchet-e01af631dc98fa3e97b01b4d3ac135cf7ca5917e.tar.bz2 android_packages_apps_Trebuchet-e01af631dc98fa3e97b01b4d3ac135cf7ca5917e.zip | |
Hiding delete for AppsCustomize widgets. (Bug 10884035)
Change-Id: I8bb4e94b34a627fc32f42cd9c22480b8fa45a651
Diffstat (limited to 'src/com/android/launcher3/DeleteDropTarget.java')
| -rw-r--r-- | src/com/android/launcher3/DeleteDropTarget.java | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java index 56f595c74..da6f2f79b 100644 --- a/src/com/android/launcher3/DeleteDropTarget.java +++ b/src/com/android/launcher3/DeleteDropTarget.java @@ -175,16 +175,10 @@ public class DeleteDropTarget extends ButtonDropTarget { boolean isVisible = true; boolean isUninstall = false; - // If we are dragging a widget from AppsCustomize, hide the delete target - if (isAllAppsWidget(source, info)) { - isVisible = false; - } - // If we are dragging an application from AppsCustomize, only show the control if we can - // delete the app (it was downloaded), and rename the string to "uninstall" in such a case - if (willAcceptDrop(info)) { - isVisible = true; - } else { + // delete the app (it was downloaded), and rename the string to "uninstall" in such a case. + // Hide the delete target if it is a widget from AppsCustomize. + if (!willAcceptDrop(info) || isAllAppsWidget(source, info)) { isVisible = false; } |