From 41b1f8f45b56878c9aa4a4044127acc761c277c0 Mon Sep 17 00:00:00 2001
From: Leon Hong <leonhong@google.com>
Date: Fri, 18 Nov 2011 14:37:50 -0800
Subject: Removing Live Wallpaper Description - Bug 5462731

Change-Id: If8d4ed443590576ffd203054f1f5b7ee26adb7cf
---
 res/layout/live_wallpaper_entry.xml                          | 10 ----------
 .../wallpaper/livepicker/LiveWallpaperListAdapter.java       | 12 ------------
 2 files changed, 22 deletions(-)

diff --git a/res/layout/live_wallpaper_entry.xml b/res/layout/live_wallpaper_entry.xml
index b39cefb..2d618f6 100644
--- a/res/layout/live_wallpaper_entry.xml
+++ b/res/layout/live_wallpaper_entry.xml
@@ -57,16 +57,6 @@
             android:singleLine="true"
             android:ellipsize="marquee" />
 
-        <TextView
-            android:id="@+id/description"
-
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-
-            android:textAppearance="?android:attr/textAppearanceSmall"
-
-            android:maxLines="3" />
-
     </LinearLayout>
 
 </RelativeLayout>
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;
     }
 
-- 
cgit v1.2.3