diff options
| author | Michael Jurka <mikejurka@google.com> | 2013-09-12 18:09:24 +0200 |
|---|---|---|
| committer | Michael Jurka <mikejurka@google.com> | 2013-09-12 20:52:26 +0200 |
| commit | ed3d4df1f5e9042742293e172c89b8cf273e969a (patch) | |
| tree | 799753ebfe9037ef42abbc45203707efd3be5ba4 /src/com/android/launcher3/DeleteDropTarget.java | |
| parent | 77e1f47520958edd7ec04e203db65b932537bd1c (diff) | |
| download | android_packages_apps_Trebuchet-ed3d4df1f5e9042742293e172c89b8cf273e969a.tar.gz android_packages_apps_Trebuchet-ed3d4df1f5e9042742293e172c89b8cf273e969a.tar.bz2 android_packages_apps_Trebuchet-ed3d4df1f5e9042742293e172c89b8cf273e969a.zip | |
Allow deleting folders and from all apps
Bug: 10635796
Diffstat (limited to 'src/com/android/launcher3/DeleteDropTarget.java')
| -rw-r--r-- | src/com/android/launcher3/DeleteDropTarget.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java index 05d6dc48c..dce18fe0b 100644 --- a/src/com/android/launcher3/DeleteDropTarget.java +++ b/src/com/android/launcher3/DeleteDropTarget.java @@ -145,6 +145,13 @@ 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_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) { |