diff options
Diffstat (limited to 'src/com/android/launcher3/model/LoaderCursor.java')
-rw-r--r-- | src/com/android/launcher3/model/LoaderCursor.java | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/com/android/launcher3/model/LoaderCursor.java b/src/com/android/launcher3/model/LoaderCursor.java index 8efebf14b..d104a8b22 100644 --- a/src/com/android/launcher3/model/LoaderCursor.java +++ b/src/com/android/launcher3/model/LoaderCursor.java @@ -380,7 +380,7 @@ public class LoaderCursor extends CursorWrapper { * otherwise marks it for deletion. */ public void checkAndAddItem(ItemInfo info, BgDataModel dataModel) { - if (checkItemPlacement(info, dataModel.workspaceScreens)) { + if (checkItemPlacement(info)) { dataModel.addItem(mContext, info, false); } else { markDeleted("Item position overlap"); @@ -390,7 +390,7 @@ public class LoaderCursor extends CursorWrapper { /** * check & update map of what's occupied; used to discard overlapping/invalid items */ - protected boolean checkItemPlacement(ItemInfo item, IntArray workspaceScreens) { + protected boolean checkItemPlacement(ItemInfo item) { int containerIndex = item.screenId; if (item.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) { final GridOccupancy hotseatOccupancy = @@ -420,12 +420,7 @@ public class LoaderCursor extends CursorWrapper { occupied.put(LauncherSettings.Favorites.CONTAINER_HOTSEAT, occupancy); return true; } - } else if (item.container == LauncherSettings.Favorites.CONTAINER_DESKTOP) { - if (!workspaceScreens.contains(item.screenId)) { - // The item has an invalid screen id. - return false; - } - } else { + } else if (item.container != LauncherSettings.Favorites.CONTAINER_DESKTOP) { // Skip further checking if it is not the hotseat or workspace container return true; } |