summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaj Yengisetty <rajesh@cyngn.com>2014-11-10 18:35:01 (GMT)
committerAdnan <adnan@cyngn.com>2014-11-19 23:53:58 (GMT)
commit82c3fdad45896b0c602d2735fd2ab437d2fe7757 (patch)
tree40d85d233016ac2919c47bd74f458bac1a3f6bf8
parent15ab1c63e0289bf59544dd8edf783e398b7bff3e (diff)
downloadandroid_packages_apps_Trebuchet-82c3fdad45896b0c602d2735fd2ab437d2fe7757.zip
android_packages_apps_Trebuchet-82c3fdad45896b0c602d2735fd2ab437d2fe7757.tar.gz
android_packages_apps_Trebuchet-82c3fdad45896b0c602d2735fd2ab437d2fe7757.tar.bz2
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
-rw-r--r--src/com/android/launcher3/Folder.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index 91f3678..7f3f47f 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -1270,6 +1270,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