diff options
| author | Daniel Sandler <dsandler@google.com> | 2009-11-20 08:28:49 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-20 08:28:49 -0800 |
| commit | 2b8b76db2b2e8ca1fd613af6d10d4cdf79cb9174 (patch) | |
| tree | d5e7a32afde4d977e60df53432c53dde24930f2a | |
| parent | 33f09068720749f90dde029d6d17885d6a16994c (diff) | |
| parent | 4854f73200dcb1870ff66c64b480602269b58764 (diff) | |
| download | android_packages_wallpapers_LivePicker-2b8b76db2b2e8ca1fd613af6d10d4cdf79cb9174.tar.gz android_packages_wallpapers_LivePicker-2b8b76db2b2e8ca1fd613af6d10d4cdf79cb9174.tar.bz2 android_packages_wallpapers_LivePicker-2b8b76db2b2e8ca1fd613af6d10d4cdf79cb9174.zip | |
am 4854f732: Merge change I05350395 into eclair
Merge commit '4854f73200dcb1870ff66c64b480602269b58764' into eclair-mr2
* commit '4854f73200dcb1870ff66c64b480602269b58764':
Fix http://b/2248037 (crash in LW picker).
| -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 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; } |