commit a50985a2e968c31b05b15b7e3c8617197151363a
author Dmitry Kalita <rusmonster@gmail.com> Mon Mar 28 23:14:29 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Mar 28 23:14:29 2016 +0000
tree 7a9655c50f6a475838129153b57fb3e7991441bd
parent b5652fd7eb6fe0665475d8fa8f28f72f2170b90c
parent a0088a51063f422ec31d1f095c3fcccdd0f2c15a

Merge "Fix restoring of layer type" into ub-launcher3-calgary
am: a0088a5

* commit 'a0088a51063f422ec31d1f095c3fcccdd0f2c15a':
  Fix restoring of layer type

src/com/android/launcher3/folder/Folder.java

diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java
index e66523d..087670e 100644
--- a/src/com/android/launcher3/folder/Folder.java
+++ b/src/com/android/launcher3/folder/Folder.java
@@ -577,7 +577,7 @@
                 @Override
                 public void run() {
                     mContentWrapper.setLayerType(LAYER_TYPE_NONE, null);
-                    mContentWrapper.setLayerType(LAYER_TYPE_NONE, null);
+                    mFooter.setLayerType(LAYER_TYPE_NONE, null);
                 }
             };
         }