commit 8ce0be3353d39d8dd540e1bfdacb88b612bc361f
author Dmitry Kalita <rusmonster@gmail.com> Wed Mar 16 18:59:22 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 16 18:59:22 2016 +0000
tree da38cf01501810661d8f082a3a2eeda802c2361e
parent 35647888f3be4f479515539062eabcd2dace96c5
parent 0b28b42c0f2d94777b517c7f270956240978e4dd

Merge "Fix restoring of layer type"
am: 0b28b42

* commit '0b28b42c0f2d94777b517c7f270956240978e4dd':
  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);
                 }
             };
         }