From 40926c6cb1c23b5a022083b5399cf2df6188e842 Mon Sep 17 00:00:00 2001 From: Raj Yengisetty Date: Tue, 17 Jun 2014 23:47:56 -0700 Subject: Fix protected folder behavior Repro: - Create a folder with 2 apps - Protect the folder - Launcher the protected apps activity in settings - Uncheck one of the apps - Observer the folder is replaced with the other protected app shortcut! Change-Id: Iee2ac65b1c92f5720c56f87a12520e320db3b4f2 --- src/com/android/launcher3/Folder.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index ef9791d52..779d26955 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -1209,6 +1209,9 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList } private void replaceFolderWithFinalItem() { + if (mInfo.hidden) { + return; + } // Add the last remaining child to the workspace in place of the folder Runnable onCompleteRunnable = new Runnable() { @Override -- cgit v1.2.3