commit ed3d4df1f5e9042742293e172c89b8cf273e969a
author Michael Jurka <mikejurka@google.com> Thu Sep 12 18:09:24 2013 +0200
committer Michael Jurka <mikejurka@google.com> Thu Sep 12 20:52:26 2013 +0200
tree 799753ebfe9037ef42abbc45203707efd3be5ba4
parent 77e1f47520958edd7ec04e203db65b932537bd1c

Allow deleting folders and from all apps

Bug: 10635796

src/com/android/launcher3/DeleteDropTarget.java

diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java
index 05d6dc4..dce18fe 100644
--- a/src/com/android/launcher3/DeleteDropTarget.java
+++ b/src/com/android/launcher3/DeleteDropTarget.java
@@ -145,6 +145,13 @@
                     item.itemType == LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT) {
                 return true;
             }
+
+            if (!AppsCustomizePagedView.DISABLE_ALL_APPS &&
+                    (item.itemType == LauncherSettings.Favorites.ITEM_TYPE_FOLDER ||
+                    item.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION)) {
+                return true;
+            }
+
             if (item.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION &&
                 item instanceof ShortcutInfo) {
                 if (AppsCustomizePagedView.DISABLE_ALL_APPS) {