diff options
author | Winson <winsonc@google.com> | 2015-09-14 12:01:13 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2015-09-14 19:47:19 +0000 |
commit | fa56b3f2f1271d6045594eed294b22841c79c783 (patch) | |
tree | 28aae9ace0e3fcdf84f91de4f818040541fc6959 /src/com/android/launcher3/DeleteDropTarget.java | |
parent | 787e3fbcaf4920b8fe1c7f78dc32deffbfc166ab (diff) | |
download | android_packages_apps_Trebuchet-fa56b3f2f1271d6045594eed294b22841c79c783.tar.gz android_packages_apps_Trebuchet-fa56b3f2f1271d6045594eed294b22841c79c783.tar.bz2 android_packages_apps_Trebuchet-fa56b3f2f1271d6045594eed294b22841c79c783.zip |
Requiring key chord to delete icons and folders on the workspace
- Also fixing case where the all apps button to search for more apps
was not focusable
Bug: 20639227
Change-Id: Ie4d9092e654d3cafc0eb346b3bb744ec3e295e92
Diffstat (limited to 'src/com/android/launcher3/DeleteDropTarget.java')
-rw-r--r-- | src/com/android/launcher3/DeleteDropTarget.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java index 163ffb6e7..c3eea2f08 100644 --- a/src/com/android/launcher3/DeleteDropTarget.java +++ b/src/com/android/launcher3/DeleteDropTarget.java @@ -70,8 +70,10 @@ public class DeleteDropTarget extends ButtonDropTarget { * @return true if the item was removed. */ public static boolean removeWorkspaceOrFolderItem(Launcher launcher, ItemInfo item, View view) { - // Remove the item from launcher and the db - launcher.removeItem(view, item, true /* deleteFromDb */); + // Remove the item from launcher and the db, we can ignore the containerInfo in this call + // because we already remove the drag view from the folder (if the drag originated from + // a folder) in Folder.beginDrag() + launcher.removeItem(view, null, item, true /* deleteFromDb */); launcher.getWorkspace().stripEmptyScreens(); return true; } |