summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-11-20 08:21:14 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-11-20 08:21:14 -0800
commit4854f73200dcb1870ff66c64b480602269b58764 (patch)
tree88c6ef6ec8de6f417c1fcdd30e8d525af46a9a4c
parentff1c31282452dc87b1dbd1e4391216b080745135 (diff)
parent05350395718b53bb827e7a0c03715c744d42ac3a (diff)
downloadandroid_packages_wallpapers_LivePicker-4854f73200dcb1870ff66c64b480602269b58764.zip
android_packages_wallpapers_LivePicker-4854f73200dcb1870ff66c64b480602269b58764.tar.gz
android_packages_wallpapers_LivePicker-4854f73200dcb1870ff66c64b480602269b58764.tar.bz2
Merge change I05350395 into eclair
* changes: Fix http://b/2248037 (crash in LW picker).
-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 44abac9..8b0ad89 100644
--- a/src/com/android/wallpaper/livepicker/LiveWallpaperListActivity.java
+++ b/src/com/android/wallpaper/livepicker/LiveWallpaperListActivity.java
@@ -222,8 +222,13 @@ public class LiveWallpaperListActivity extends ListActivity implements AdapterVi
holder.thumbnail.setImageDrawable(mThumbnails.get(position));
// author not currently used
holder.titleAuthor.setText(info.loadLabel(mPackageManager));
- holder.description.setText(Html.fromHtml(
- info.loadDescription(mPackageManager).toString()));
+ try {
+ holder.description.setVisibility(View.VISIBLE);
+ holder.description.setText(Html.fromHtml(
+ info.loadDescription(mPackageManager).toString()));
+ } catch (Resources.NotFoundException e) {
+ holder.description.setVisibility(View.GONE);
+ }
return convertView;
}