From a6612cd45fc77e4f44fcdd1a74833a61bf440720 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Tue, 21 Dec 2010 17:34:25 -0800
Subject: Adjusting wallpaper picker to match spec

Change-Id: I004f15119648b9435bd73a400bd0193962e9569f
---
 .../android/launcher2/WallpaperChooserDialogFragment.java  | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'src/com/android/launcher2/WallpaperChooserDialogFragment.java')

diff --git a/src/com/android/launcher2/WallpaperChooserDialogFragment.java b/src/com/android/launcher2/WallpaperChooserDialogFragment.java
index 10bfc56bc..ec0f8a2ef 100644
--- a/src/com/android/launcher2/WallpaperChooserDialogFragment.java
+++ b/src/com/android/launcher2/WallpaperChooserDialogFragment.java
@@ -37,6 +37,7 @@ import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
+import android.widget.FrameLayout;
 import android.widget.Gallery;
 import android.widget.GridView;
 import android.widget.ImageView;
@@ -120,10 +121,11 @@ public class WallpaperChooserDialogFragment extends DialogFragment implements
         final int viewInset =
                 getResources().getDimensionPixelSize(R.dimen.alert_dialog_content_inset);
 
+        FrameLayout wallPaperList = (FrameLayout) v.findViewById(R.id.wallpaper_list);
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         builder.setNegativeButton(R.string.wallpaper_cancel, null);
         builder.setTitle(R.string.wallpaper_dialog_title);
-        builder.setView(gridView, viewInset, viewInset, viewInset, viewInset);
+        builder.setView(wallPaperList, viewInset, viewInset, viewInset, viewInset);
         return builder.create();
     }
 
@@ -241,14 +243,16 @@ public class WallpaperChooserDialogFragment extends DialogFragment implements
         }
 
         public View getView(int position, View convertView, ViewGroup parent) {
-            ImageView image;
+            View view;
 
             if (convertView == null) {
-                image = (ImageView) mLayoutInflater.inflate(R.layout.wallpaper_item, parent, false);
+                view = mLayoutInflater.inflate(R.layout.wallpaper_item, parent, false);
             } else {
-                image = (ImageView) convertView;
+                view = convertView;
             }
 
+            ImageView image = (ImageView) view.findViewById(R.id.wallpaper_image);
+
             int thumbRes = mThumbs.get(position);
             image.setImageResource(thumbRes);
             Drawable thumbDrawable = image.getDrawable();
@@ -259,7 +263,7 @@ public class WallpaperChooserDialogFragment extends DialogFragment implements
                         + position);
             }
 
-            return image;
+            return view;
         }
     }
 
-- 
cgit v1.2.3