am 0dffdc7e: Merge change Iead6e21b into eclair

Merge commit '0dffdc7ea90919e1c449f5832e952a5ab140ddf8' into eclair-mr2

* commit '0dffdc7ea90919e1c449f5832e952a5ab140ddf8':
  Clean up live wallpaper picker list.

3 files changed, 16 insertions, 16 deletions

diff --git a/res/layout/live_wallpaper_entry.xml b/res/layout/live_wallpaper_entry.xml
index ce48242..529371e 100644
--- a/res/layout/live_wallpaper_entry.xml
+++ b/res/layout/live_wallpaper_entry.xml
@@ -14,12 +14,15 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
 
-    android:paddingLeft="4dip"
-    android:paddingRight="4dip"
+    android:paddingLeft="6dip"
+    android:paddingRight="6dip"
+    android:paddingTop="6dip"
+    android:paddingBottom="6dip"
+
     android:minHeight="?android:attr/listPreferredItemHeight">
 
     <ImageView
@@ -30,14 +33,16 @@
 
         android:layout_gravity="center_vertical"
 
-        android:scaleType="fitCenter" />
+        android:scaleType="centerCrop" />
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
 
-        android:layout_marginLeft="8dip"
-        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="10dip"
+        android:layout_marginRight="8dip"
+        android:layout_centerVertical="true"
+        android:layout_toRightOf="@id/thumbnail"
 
         android:orientation="vertical">
 
@@ -64,4 +69,4 @@
 
     </LinearLayout>
 
-</LinearLayout>
+</RelativeLayout>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index 080a55a..d0ee3a6 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -20,6 +20,6 @@
 <resources>
     <dimen name="live_wallpaper_thumbnail_text_size">14dip</dimen>
     <dimen name="live_wallpaper_thumbnail_text_offset">12dip</dimen>
-    <dimen name="live_wallpaper_thumbnail_width">100dip</dimen>
-    <dimen name="live_wallpaper_thumbnail_height">79dip</dimen>
+    <dimen name="live_wallpaper_thumbnail_width">75dip</dimen>
+    <dimen name="live_wallpaper_thumbnail_height">75dip</dimen>
 </resources>
diff --git a/src/com/android/wallpaper/livepicker/LiveWallpaperListActivity.java b/src/com/android/wallpaper/livepicker/LiveWallpaperListActivity.java
index 06ca937..44abac9 100644
--- a/src/com/android/wallpaper/livepicker/LiveWallpaperListActivity.java
+++ b/src/com/android/wallpaper/livepicker/LiveWallpaperListActivity.java
@@ -220,13 +220,8 @@ public class LiveWallpaperListActivity extends ListActivity implements AdapterVi
 
             WallpaperInfo info = mWallpaperInfos.get(position);
             holder.thumbnail.setImageDrawable(mThumbnails.get(position));
-            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));
-            }
+            // author not currently used
+            holder.titleAuthor.setText(info.loadLabel(mPackageManager));
             holder.description.setText(Html.fromHtml(
                     info.loadDescription(mPackageManager).toString()));