commit 4d557677401dbb9430039791a3d2a1829583e8a4
author Sunny Goyal <sunnygoyal@google.com> Fri May 15 19:01:24 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri May 15 19:01:24 2015 +0000
tree d7e8d355e73c3933217d0eef32077892ba96ee42
parent 49f9c8e032c4c3c4f9c79fecd53bbebe4a34a50a
parent 9353903d442fa8dc3dd93168e6f9cf0dcf999dd7

am 9353903d: Merge "Fixing issue with folder inflation" into ub-launcher3-burnaby

* commit '9353903d442fa8dc3dd93168e6f9cf0dcf999dd7':
  Fixing issue with folder inflation

src/com/android/launcher3/Folder.java

diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index 131633c..69b1837 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -406,9 +406,9 @@
      *
      * @return A new UserFolder.
      */
+    @SuppressLint("InflateParams")
     static Folder fromXml(Launcher launcher) {
-        return (Folder) LayoutInflater.from(launcher).inflate(R.layout.user_folder,
-                launcher.getDragLayer(), false);
+        return (Folder) launcher.getLayoutInflater().inflate(R.layout.user_folder, null);
     }
 
     /**