aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 10:48:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolved conflicts for e78e3d73 to ub-launcher3-master

Browse Source 
Change-Id: Idc119a57e21cf6016ee0fd91866839301db072d6
This commit is contained in:
Sunny Goyal
2015-09-25 11:50:16 -07:00
parent 1f832f85d5 e78e3d734b
commit 9d4380856f
14 changed files with 207 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/launcher3/DeleteDropTarget.java
View File

@@ -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