commit 5a4372f4638f9a1fc5c052d85977fbcc0c4d8c55
author Michael Kolb <kolby@google.com> Fri Apr 29 13:53:10 2011 -0700
committer Michael Kolb <kolby@google.com> Fri Apr 29 13:53:10 2011 -0700
tree efd0998d1ac1a298a5a71fcc7ad5326abfc08592
parent 71d7153c881a22ceb70e215357c2e342b9a9b91c

fix phone titlebar

Change-Id: I76908b1cf4eb61f64c3531c75e589f1b80bdaaba

src/com/android/browser/NavScreen.java

diff --git a/src/com/android/browser/NavScreen.java b/src/com/android/browser/NavScreen.java
index c61c39f..e636b2b 100644
--- a/src/com/android/browser/NavScreen.java
+++ b/src/com/android/browser/NavScreen.java
@@ -297,13 +297,12 @@
             } else {
                 content = (ImageView) convertView.findViewById(R.id.content);
             }
+            View tbar = convertView.findViewById(R.id.titlebar);
             TextView title = (TextView) convertView.findViewById(R.id.title);
             ImageView icon = (ImageView) convertView.findViewById(R.id.favicon);
             ImageButton close = (ImageButton) convertView.findViewById(R.id.closetab);
             final Tab tab = getItem(position);
-            if (tab.getFavicon() != null) {
-                icon.setImageBitmap(tab.getFavicon());
-            }
+            icon.setImageDrawable(mUi.getFaviconDrawable(tab.getFavicon()));
             title.setText(tab.getUrl());
             Bitmap screen = tab.getScreenshot();
             content.setImageBitmap(screen);
@@ -313,7 +312,7 @@
                     onCloseTab(tab);
                 }
             });
-            title.setOnClickListener(new OnClickListener() {
+            tbar.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(View v) {
                     close(false);