diff options
| author | Adam Cohen <adamcohen@google.com> | 2014-07-25 13:24:09 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2014-07-25 20:47:03 +0000 |
| commit | 2d7e7eda680d481af2eb9ff85182eb89b5395d4c (patch) | |
| tree | 47072f98fe7fc014b688066d17aa6eecf55319d7 /src/com/android/launcher3 | |
| parent | e28cc02e81613ee543c31b8aa25809227c4184a2 (diff) | |
| download | android_packages_apps_Trebuchet-2d7e7eda680d481af2eb9ff85182eb89b5395d4c.tar.gz android_packages_apps_Trebuchet-2d7e7eda680d481af2eb9ff85182eb89b5395d4c.tar.bz2 android_packages_apps_Trebuchet-2d7e7eda680d481af2eb9ff85182eb89b5395d4c.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
(cherry picked from commit 43f3ca0f8c424415dfa0cd6c269900638da3d21c)
Diffstat (limited to 'src/com/android/launcher3')
| -rw-r--r-- | src/com/android/launcher3/LauncherProvider.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index 2256179c3..65c0d5fe6 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -1404,7 +1404,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 |