diff options
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/wallpaper/livepicker/LiveWallpaperListAdapter.java | 12 | ||||
| -rw-r--r-- | src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java | 4 |
2 files changed, 4 insertions, 12 deletions
diff --git a/src/com/android/wallpaper/livepicker/LiveWallpaperListAdapter.java b/src/com/android/wallpaper/livepicker/LiveWallpaperListAdapter.java index b10de8b..e526f9e 100644 --- a/src/com/android/wallpaper/livepicker/LiveWallpaperListAdapter.java +++ b/src/com/android/wallpaper/livepicker/LiveWallpaperListAdapter.java @@ -102,7 +102,6 @@ public class LiveWallpaperListAdapter extends BaseAdapter implements ListAdapter holder = new ViewHolder(); holder.title = (TextView) convertView.findViewById(R.id.title); - holder.description = (TextView) convertView.findViewById(R.id.description); holder.thumbnail = (ImageView) convertView.findViewById(R.id.thumbnail); convertView.setTag(holder); } else { @@ -122,16 +121,6 @@ public class LiveWallpaperListAdapter extends BaseAdapter implements ListAdapter } } - if (holder.description != null && wallpaperInfo.info != null) { - try { - holder.description.setVisibility(View.VISIBLE); - holder.description.setText(Html.fromHtml( - wallpaperInfo.info.loadDescription(mPackageManager).toString())); - } catch (Resources.NotFoundException e) { - holder.description.setVisibility(View.GONE); - } - } - return convertView; } @@ -143,7 +132,6 @@ public class LiveWallpaperListAdapter extends BaseAdapter implements ListAdapter private class ViewHolder { TextView title; - TextView description; ImageView thumbnail; } diff --git a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java index 54b6382..d4f7ef7 100644 --- a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java +++ b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java @@ -58,6 +58,10 @@ public class LiveWallpaperPreview extends Activity { private Dialog mDialog; static void showPreview(Activity activity, int code, Intent intent, WallpaperInfo info) { + if (info == null) { + Log.w(LOG_TAG, "Failure showing preview", new Throwable()); + return; + } Intent preview = new Intent(activity, LiveWallpaperPreview.class); preview.putExtra(EXTRA_LIVE_WALLPAPER_INTENT, intent); preview.putExtra(EXTRA_LIVE_WALLPAPER_SETTINGS, info.getSettingsActivity()); |