commit 2d7e7eda680d481af2eb9ff85182eb89b5395d4c
author Adam Cohen <adamcohen@google.com> Fri Jul 25 13:24:09 2014 -0700
committer Adam Cohen <adamcohen@google.com> Fri Jul 25 20:47:03 2014 +0000
tree 47072f98fe7fc014b688066d17aa6eecf55319d7
parent e28cc02e81613ee543c31b8aa25809227c4184a2

Fix resource issue in folders of partner layouts

-> Resources in folders were not being loaded with the partner
   apk resources. This caused any number of weird things to appear
   in folders of partner default layouts

Change-Id: I7d373e53028c5c327980c15d004993af997de553
(cherry picked from commit 43f3ca0f8c424415dfa0cd6c269900638da3d21c)

src/com/android/launcher3/LauncherProvider.java

diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 2256179..65c0d5f 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -1404,7 +1404,7 @@
                         }
                     } else if (TAG_FOLDER.equals(name)) {
                         // Folder contents are nested in this XML file
-                        added = loadFolder(db, values, mContext.getResources(), parser);
+                        added = loadFolder(db, values, res, parser);
 
                     } else if (TAG_PARTNER_FOLDER.equals(name)) {
                         // Folder contents come from an external XML resource