Hiding delete for AppsCustomize widgets. (Bug 10884035)
Change-Id: I8bb4e94b34a627fc32f42cd9c22480b8fa45a651
diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java
index 56f595c..da6f2f7 100644
--- a/src/com/android/launcher3/DeleteDropTarget.java
+++ b/src/com/android/launcher3/DeleteDropTarget.java
@@ -175,16 +175,10 @@
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;
}