diff options
| author | Daniel Sandler <dsandler@google.com> | 2009-11-11 17:33:03 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-11 17:33:03 -0800 |
| commit | c372f487400b4973f535ea27db54d55cb7f6c0ae (patch) | |
| tree | 3bdf994eaa87e1aebc8b9eb1ca7d1b4f793722a9 | |
| parent | 6d65bec3ff32852a150011431344a1420f225d18 (diff) | |
| parent | 54ad5ee90fdfa29debd08fbbed27fa3f67abc77e (diff) | |
| download | android_packages_wallpapers_LivePicker-c372f487400b4973f535ea27db54d55cb7f6c0ae.tar.gz android_packages_wallpapers_LivePicker-c372f487400b4973f535ea27db54d55cb7f6c0ae.tar.bz2 android_packages_wallpapers_LivePicker-c372f487400b4973f535ea27db54d55cb7f6c0ae.zip | |
am 54ad5ee9: am 3a032856: Fix http://b/2248037 .
Merge commit '54ad5ee90fdfa29debd08fbbed27fa3f67abc77e'
* commit '54ad5ee90fdfa29debd08fbbed27fa3f67abc77e':
Fix http://b/2248037 .
| -rw-r--r-- | src/com/android/wallpaper/livepicker/LiveWallpaperListActivity.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/wallpaper/livepicker/LiveWallpaperListActivity.java b/src/com/android/wallpaper/livepicker/LiveWallpaperListActivity.java index 99a22fe..06ca937 100644 --- a/src/com/android/wallpaper/livepicker/LiveWallpaperListActivity.java +++ b/src/com/android/wallpaper/livepicker/LiveWallpaperListActivity.java @@ -220,8 +220,13 @@ public class LiveWallpaperListActivity extends ListActivity implements AdapterVi WallpaperInfo info = mWallpaperInfos.get(position); holder.thumbnail.setImageDrawable(mThumbnails.get(position)); - holder.titleAuthor.setText(getString(R.string.wallpaper_title_and_author, - info.loadLabel(mPackageManager), info.loadAuthor(mPackageManager))); + try { + CharSequence author = info.loadAuthor(mPackageManager); + holder.titleAuthor.setText(getString(R.string.wallpaper_title_and_author, + info.loadLabel(mPackageManager), author)); + } catch (Resources.NotFoundException e) { + holder.titleAuthor.setText(info.loadLabel(mPackageManager)); + } holder.description.setText(Html.fromHtml( info.loadDescription(mPackageManager).toString())); |