From 9bd4d28163e3872de9c9019528cbb570f504fe05 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Thu, 5 Sep 2013 19:21:31 +0200
Subject: If All Apps is reinstated, allowing removing items from Workspace

---
 src/com/android/launcher3/DeleteDropTarget.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/com')

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;
-- 
cgit v1.2.3