diff options
author | Abhisek Devkota <ciwrl@cyanogenmod.com> | 2014-06-18 18:44:53 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2014-06-18 18:44:53 +0000 |
commit | dfbfff151c84b33744c6c631af31b9f149efc528 (patch) | |
tree | 78431ff81f7b9131f5cdc37979121f1b0d2b6ac1 /src | |
parent | 8ca6c2a3d078aab3746a59a123b5a100bca6a2df (diff) | |
parent | 40926c6cb1c23b5a022083b5399cf2df6188e842 (diff) | |
download | android_packages_apps_Trebuchet-dfbfff151c84b33744c6c631af31b9f149efc528.tar.gz android_packages_apps_Trebuchet-dfbfff151c84b33744c6c631af31b9f149efc528.tar.bz2 android_packages_apps_Trebuchet-dfbfff151c84b33744c6c631af31b9f149efc528.zip |
Merge "Fix protected folder behavior" into cm-11.0
Diffstat (limited to 'src')
-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 c8047d03b..9d7907c43 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -1208,6 +1208,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 |