diff options
| author | Raj Yengisetty <rajesh@cyngn.com> | 2014-06-17 23:47:56 -0700 |
|---|---|---|
| committer | Raj Yengisetty <rajesh@cyngn.com> | 2014-06-17 23:50:31 -0700 |
| commit | 40926c6cb1c23b5a022083b5399cf2df6188e842 (patch) | |
| tree | d54d149e7959be6133e2d0116d428e283f665727 | |
| parent | 7b286808c4f606053f1b92c9563ea3b23ff7d1ec (diff) | |
| download | android_packages_apps_Trebuchet-40926c6cb1c23b5a022083b5399cf2df6188e842.tar.gz android_packages_apps_Trebuchet-40926c6cb1c23b5a022083b5399cf2df6188e842.tar.bz2 android_packages_apps_Trebuchet-40926c6cb1c23b5a022083b5399cf2df6188e842.zip | |
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.java | 3 |
1 files changed, 3 insertions, 0 deletions
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 |