diff options
author | Michael Jurka <mikejurka@google.com> | 2013-09-05 19:21:31 +0200 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2013-09-05 19:25:11 +0200 |
commit | 9bd4d28163e3872de9c9019528cbb570f504fe05 (patch) | |
tree | 9589ba49270696073e22f4b552b7065eb7aadea9 /src/com | |
parent | b56e95af5d46510334e01b109c4ec34f46be4562 (diff) | |
download | packages_apps_Trebuchet-9bd4d28163e3872de9c9019528cbb570f504fe05.tar.gz packages_apps_Trebuchet-9bd4d28163e3872de9c9019528cbb570f504fe05.tar.bz2 packages_apps_Trebuchet-9bd4d28163e3872de9c9019528cbb570f504fe05.zip |
If All Apps is reinstated, allowing removing items from Workspace
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/launcher3/DeleteDropTarget.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java index 09fad8378..05d6dc48c 100644 --- a/src/com/android/launcher3/DeleteDropTarget.java +++ b/src/com/android/launcher3/DeleteDropTarget.java @@ -145,11 +145,14 @@ public class DeleteDropTarget extends ButtonDropTarget { item.itemType == LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT) { return true; } - if (AppsCustomizePagedView.DISABLE_ALL_APPS && - item.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION && + if (item.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION && item instanceof ShortcutInfo) { - ShortcutInfo shortcutInfo = (ShortcutInfo) info; - return (shortcutInfo.flags & AppInfo.DOWNLOADED_FLAG) != 0; + if (AppsCustomizePagedView.DISABLE_ALL_APPS) { + ShortcutInfo shortcutInfo = (ShortcutInfo) info; + return (shortcutInfo.flags & AppInfo.DOWNLOADED_FLAG) != 0; + } else { + return true; + } } } return false; |