summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2014-07-25 13:24:09 -0700
committerAdam Cohen <adamcohen@google.com>2014-07-25 13:38:45 -0700
commit43f3ca0f8c424415dfa0cd6c269900638da3d21c (patch)
tree15a446e43c7c9adcc4d76676443647dcc9075df7 /src
parent950a467b180c78d3ce3bbe7b4a227a13d28b2536 (diff)
downloadandroid_packages_apps_Trebuchet-43f3ca0f8c424415dfa0cd6c269900638da3d21c.tar.gz
android_packages_apps_Trebuchet-43f3ca0f8c424415dfa0cd6c269900638da3d21c.tar.bz2
android_packages_apps_Trebuchet-43f3ca0f8c424415dfa0cd6c269900638da3d21c.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/LauncherProvider.java2
1 files changed, 1 insertions, 1 deletions
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