commit 89c6d36e2e6d6040540ee93ef4df29a6874a6a95
author Leon Scroggins <scroggo@google.com> Wed Jul 15 16:54:37 2009 -0400
committer Leon Scroggins <scroggo@google.com> Wed Jul 15 17:03:18 2009 -0400
tree 2865c32137536e900c496fbd9ec25263978a2222
parent 650a7b8a8606e04244494fed324f5d4526849e33

Work on the Bookmark Grid, including the favicon.

Remove the file BookmarkGridPage, since a GridView will do just fine.
Now we specify a height and width for the bitmaps rather than adjusting
them for the screen size.  Also add the favicon and match the design
more closely for the Add option.  In BrowserActivity, match the size
of the saved screenshots to the desired size for the Bookmarks
Activity.  Also move the logic into its own method so it can be
called from multiple places (still called in only one at the moment).

src/com/android/browser/BrowserBookmarksPage.java

diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java
index 513ce3e..428aa92 100644
--- a/src/com/android/browser/BrowserBookmarksPage.java
+++ b/src/com/android/browser/BrowserBookmarksPage.java
@@ -44,6 +44,7 @@
 import android.view.ViewGroup;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.widget.AdapterView;
+import android.widget.GridView;
 import android.widget.ListView;
 import android.widget.Toast;
 
@@ -54,7 +55,7 @@
         View.OnCreateContextMenuListener {
 
     private boolean                 mGridMode;
-    private BookmarkGridPage        mGridPage;
+    private GridView                mGridPage;
     private View                    mVerticalList;
     private BrowserBookmarksAdapter mBookmarksAdapter;
     private static final int        BOOKMARKS_SAVE = 1;
@@ -181,9 +182,9 @@
 
         setTitle(R.string.browser_bookmarks_page_bookmarks_text);
         mBookmarksAdapter = new BrowserBookmarksAdapter(this,
-                        getIntent().getStringExtra("url"), mCreateShortcut);
-        mGridMode = true;
-        switchViewMode(mGridMode);
+                        getIntent().getStringExtra("url"),
+                        getIntent().getStringExtra("title"), mCreateShortcut);
+        switchViewMode(true);
     }
 
     /**
@@ -195,8 +196,17 @@
         mBookmarksAdapter.switchViewMode(gridMode);
         if (mGridMode) {
             if (mGridPage == null) {
-                mGridPage = new BookmarkGridPage(this, mBookmarksAdapter);
+                mGridPage = new GridView(this);
+                mGridPage.setAdapter(mBookmarksAdapter);
                 mGridPage.setOnItemClickListener(mListener);
+                mGridPage.setNumColumns(GridView.AUTO_FIT);
+                // Keep this in sync with bookmark_thumb and
+                // BrowserActivity.updateScreenshot
+                mGridPage.setColumnWidth(100);
+                mGridPage.setFocusable(true);
+                mGridPage.setFocusableInTouchMode(true);
+                mGridPage.setSelector(android.R.drawable.gallery_thumb);
+                mGridPage.setVerticalSpacing(10);
                 if (!mCreateShortcut) {
                     mGridPage.setOnCreateContextMenuListener(this);
                 }