diff options
Diffstat (limited to 'src/com/android/launcher3/LauncherModel.java')
| -rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index e0ad4615f..a8bcb2c66 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -2747,10 +2747,13 @@ public class LauncherModel extends BroadcastReceiver ShortcutInfo finalItem = folder.contents.get(0); finalItem.container = folder.container; LauncherModel.deleteItemFromDatabase(mContext, folder); - LauncherModel.addOrMoveItemInDatabase(mContext, finalItem, folder.container, - folder.screenId, folder.cellX, folder.cellY); + // only replace this item back on the workspace if it's not protected + if (!mHiddenApps.contains(finalItem.intent.getComponent())) { + LauncherModel.addOrMoveItemInDatabase(mContext, finalItem, folder.container, + folder.screenId, folder.cellX, folder.cellY); + workspaceItems.add(finalItem); + } workspaceItems.remove(i); - workspaceItems.add(finalItem); folders.remove(Long.valueOf(item.id)); } else if (folder.contents.size() == 0 /*&& !(folder instanceof LiveFolderInfo)*/) { LauncherModel.deleteFolderContentsFromDatabase(mContext, folder); |