am a3c9fb12: Merge "Requiring key chord to delete icons and folders on the workspace" into ub-launcher3-burnaby-polish

* commit 'a3c9fb125c7449df5add990e91e0e3471e3cc776':
  Requiring key chord to delete icons and folders on the workspace
This commit is contained in:
Winson Chung authored and Android Git Automerger committed 2015-09-18 18:53:48 +00:00
commit 26bfdd9d5a
6 files changed
+74 -32

No files matched your search

+2 -2
View File
@@ -1105,7 +1105,7 @@ public class Workspace extends PagedView
if (lahv != null && lahv.isReinflateRequired()) {
// Remove and rebind the current widget (which was inflated in the wrong
// orientation), but don't delete it from the database
mLauncher.removeItem(lahv, info, false /* deleteFromDb */);
mLauncher.removeItem(lahv, null, info, false /* deleteFromDb */);
mLauncher.bindAppWidget(info);
}
}
@@ -4441,7 +4441,7 @@ public class Workspace extends PagedView
if (info.hostView instanceof PendingAppWidgetHostView) {
// Remove and rebind the current widget, but don't delete it from the database
PendingAppWidgetHostView view = (PendingAppWidgetHostView) info.hostView;
mLauncher.removeItem(view, info, false /* deleteFromDb */);
mLauncher.removeItem(view, null, info, false /* deleteFromDb */);
mLauncher.bindAppWidget(info);
}
}