More closely match the intended design of the bookmark grid page.

Change the look of the text.  Use a blank white rectangle with
rounded corners for sites without a stored screenshot.  Also
begin work on using the favicon.

1 files changed, 14 insertions, 9 deletions

diff --git a/src/com/android/browser/BookmarkGridPage.java b/src/com/android/browser/BookmarkGridPage.java
index ed514644e..2e0518316 100644
--- a/src/com/android/browser/BookmarkGridPage.java
+++ b/src/com/android/browser/BookmarkGridPage.java
@@ -201,6 +201,8 @@ public class BookmarkGridPage extends Activity {
                 v = factory.inflate(R.layout.bookmark_thumbnail, null);
             }
             ImageView thumb = (ImageView) v.findViewById(R.id.thumb);
+            // Favicon disabled for now.
+            //ImageView fav = (ImageView) v.findViewById(R.id.fav);
             TextView tv = (TextView) v.findViewById(R.id.label);
 
             ViewGroup.LayoutParams lp = thumb.getLayoutParams();
@@ -223,20 +225,23 @@ public class BookmarkGridPage extends Activity {
             byte[] data = mCursor.getBlob(
                     Browser.HISTORY_PROJECTION_THUMBNAIL_INDEX);
             if (data == null) {
-                // Backup is to show the favicon
-                data = mCursor.getBlob(
-                        Browser.HISTORY_PROJECTION_FAVICON_INDEX);
-                thumb.setScaleType(ImageView.ScaleType.CENTER);
+                // Backup is to just show white
+                thumb.setImageResource(R.drawable.blank);
             } else {
-                thumb.setScaleType(ImageView.ScaleType.FIT_XY);
-            }
-            if (data != null) {
                 thumb.setImageBitmap(
                         BitmapFactory.decodeByteArray(data, 0, data.length));
+            }
+/*
+            // Now show the favicon
+            data = mCursor.getBlob(Browser.HISTORY_PROJECTION_FAVICON_INDEX);
+            if (data == null) {
+                fav.setVisibility(View.GONE);
             } else {
-                thumb.setImageResource(R.drawable.app_web_browser_sm);
-                thumb.setScaleType(ImageView.ScaleType.CENTER);
+                fav.setVisibility(View.VISIBLE);
+                fav.setImageBitmap(
+                        BitmapFactory.decodeByteArray(data, 0, data.length));
             }
+*/
             return v;
         }