commit 0b28b42c0f2d94777b517c7f270956240978e4dd
author Sunny Goyal <sunnygoyal@google.com> Wed Mar 16 17:19:49 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 16 17:19:50 2016 +0000
tree 0860791c00140f0ab088a4132f1dcdb04eedb22c
parent 135e8cb721efee9d828fc98044a9340cc354b3a4
parent fb7ab0e56f6fdf63c21e6657e0fcd0139f345c0a

Merge "Fix restoring of layer type"

src/com/android/launcher3/Folder.java

diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index c1aa356..9533ac7 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -526,7 +526,7 @@
                 @Override
                 public void run() {
                     mContentWrapper.setLayerType(LAYER_TYPE_NONE, null);
-                    mContentWrapper.setLayerType(LAYER_TYPE_NONE, null);
+                    mFooter.setLayerType(LAYER_TYPE_NONE, null);
                 }
             };
         }