From 43f3ca0f8c424415dfa0cd6c269900638da3d21c Mon Sep 17 00:00:00 2001 From: Adam Cohen Date: Fri, 25 Jul 2014 13:24:09 -0700 Subject: 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 --- src/com/android/launcher3/LauncherProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index ac4a2063e..f77cdca41 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -1447,7 +1447,7 @@ public class LauncherProvider extends ContentProvider { } } 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 -- cgit v1.2.3