diff options
authorRoman Birg <>2015-04-16 11:24:53 -0700
committerRajesh Yengisetty <>2015-04-16 18:36:24 +0000
commitc8b7105b3e93d1c4d792690db57eeae75f71662e (patch)
parent0bdb2e3a34118289aca0b53adcb4dd198b39a0dd (diff)
Trebuchet: fix Protected apps issue with folders
When there's a folder of shortcuts where all of the items have been set to protected, the first item in the folder sometimes does not get removed from the workspace allowing access to the protected application. When the second-to-last item in a folder is being removed, it was being replaced with the shortcut automatically, and we were checking against the folder contents, which was off the workspace at this time, but still had the shortcut. We need to check whether the last shortcut we are re-adding back to the workspace is actually protected before adding it. Change-Id: I9c7dbbd8562ae3e71e198747e6cb1c10417d1f46 Signed-off-by: Roman Birg <> (cherry picked from commit d06291251703ce19968625742438c03351203d37)
1 files changed, 6 insertions, 3 deletions
diff --git a/src/com/android/launcher3/ b/src/com/android/launcher3/
index e0ad4615f..a8bcb2c66 100644
--- a/src/com/android/launcher3/
+++ b/src/com/android/launcher3/
@@ -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.add(finalItem);
} else if (folder.contents.size() == 0 /*&& !(folder instanceof LiveFolderInfo)*/) {
LauncherModel.deleteFolderContentsFromDatabase(mContext, folder);