diff options
author | Daniel Sandler <dsandler@google.com> | 2010-03-05 11:04:10 -0500 |
---|---|---|
committer | Daniel Sandler <dsandler@google.com> | 2010-03-05 13:43:30 -0500 |
commit | 76c0e1408b059a8f7f2e76327f4943c3e1b11f41 (patch) | |
tree | 2a23f2fd5acff3ccbfee3e37e335a26ada50a334 | |
parent | fe609f3babab9d076484ac61670683fd04908fa5 (diff) | |
download | android_packages_apps_Trebuchet-76c0e1408b059a8f7f2e76327f4943c3e1b11f41.tar.gz android_packages_apps_Trebuchet-76c0e1408b059a8f7f2e76327f4943c3e1b11f41.tar.bz2 android_packages_apps_Trebuchet-76c0e1408b059a8f7f2e76327f4943c3e1b11f41.zip |
Use the right package name to find wallpaper resources.
Bug: 2489120
Change-Id: I7efb122916edfb467c02969f29d845ebf29f74bf
-rw-r--r-- | src/com/android/launcher2/WallpaperChooser.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/launcher2/WallpaperChooser.java b/src/com/android/launcher2/WallpaperChooser.java index 11621cefa..bf8ba2e8d 100644 --- a/src/com/android/launcher2/WallpaperChooser.java +++ b/src/com/android/launcher2/WallpaperChooser.java @@ -78,7 +78,11 @@ public class WallpaperChooser extends Activity implements AdapterView.OnItemSele mImages = new ArrayList<Integer>(24); final Resources resources = getResources(); - final String packageName = getApplication().getPackageName(); + // Context.getPackageName() may return the "original" package name, + // com.android.launcher2; Resources needs the real package name, + // com.android.launcher. So we ask Resources for what it thinks the + // package name should be. + final String packageName = resources.getResourcePackageName(R.array.wallpapers); addWallpapers(resources, packageName, R.array.wallpapers); addWallpapers(resources, packageName, R.array.extra_wallpapers); @@ -95,6 +99,7 @@ public class WallpaperChooser extends Activity implements AdapterView.OnItemSele if (thumbRes != 0) { mThumbs.add(thumbRes); mImages.add(res); + // Log.d(TAG, "addWallpapers: [" + packageName + "]: " + extra + " (" + res + ")"); } } } |