commit 9353903d442fa8dc3dd93168e6f9cf0dcf999dd7
author Sunny Goyal <sunnygoyal@google.com> Fri May 15 18:51:35 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 15 18:51:36 2015 +0000
tree 74ea6544865896a29dbed41e9a16ac0085aeee77
parent b4de9140149982ae2671e123334666e64628d22a
parent c23da84a870c12c06fb61fd066073332155f48ed

Merge "Fixing issue with folder inflation" into ub-launcher3-burnaby

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);
     }
 
     /**