diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-09-25 11:50:16 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2015-09-25 11:50:16 -0700 |
commit | 9d4380856ff41ecb26c0d5aee1747b6060d2ef0e (patch) | |
tree | 59f1195b66f6adab842c52e86c3e83688b835a3b /src/com/android/launcher3/DeleteDropTarget.java | |
parent | 1f832f85d59600fc4c212dec51a5112a6b7427d5 (diff) | |
parent | e78e3d734b577c1ab6dc0738a83600374908ea52 (diff) | |
download | android_packages_apps_Trebuchet-9d4380856ff41ecb26c0d5aee1747b6060d2ef0e.tar.gz android_packages_apps_Trebuchet-9d4380856ff41ecb26c0d5aee1747b6060d2ef0e.tar.bz2 android_packages_apps_Trebuchet-9d4380856ff41ecb26c0d5aee1747b6060d2ef0e.zip |
resolved conflicts for e78e3d73 to ub-launcher3-master
Change-Id: Idc119a57e21cf6016ee0fd91866839301db072d6
Diffstat (limited to 'src/com/android/launcher3/DeleteDropTarget.java')
-rw-r--r-- | src/com/android/launcher3/DeleteDropTarget.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java index 9b65a7127..3a79d94fa 100644 --- a/src/com/android/launcher3/DeleteDropTarget.java +++ b/src/com/android/launcher3/DeleteDropTarget.java @@ -67,15 +67,14 @@ public class DeleteDropTarget extends ButtonDropTarget { /** * Removes the item from the workspace. If the view is not null, it also removes the view. - * @return true if the item was removed. */ - public static boolean removeWorkspaceOrFolderItem(Launcher launcher, ItemInfo item, View view) { + public static void removeWorkspaceOrFolderItem(Launcher launcher, ItemInfo item, View view) { // 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, item, true /* deleteFromDb */); launcher.getWorkspace().stripEmptyScreens(); - return true; + launcher.getDragLayer().announceForAccessibility(launcher.getString(R.string.item_removed)); } @Override |