summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@google.com>2009-11-11 10:57:22 -0800
committerDaniel Sandler <dsandler@google.com>2009-11-11 11:00:15 -0800
commit3a032856e7adc7bbccf165e8c0eeb86a38bdc57b (patch)
treea5fe2933c4d414feb549868c29fa2e8fc17efe64 /src/com/android
parentd4e57d4cb45c0c7db605420dccd9fd4db854e998 (diff)
downloadandroid_packages_wallpapers_LivePicker-3a032856e7adc7bbccf165e8c0eeb86a38bdc57b.tar.gz
android_packages_wallpapers_LivePicker-3a032856e7adc7bbccf165e8c0eeb86a38bdc57b.tar.bz2
android_packages_wallpapers_LivePicker-3a032856e7adc7bbccf165e8c0eeb86a38bdc57b.zip
Fix http://b/2248037 .
If there's no author information, just show the title in the picker list.
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/wallpaper/livepicker/LiveWallpaperListActivity.java9
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()));