From 4b086384084020b8f576947bf98049a6a14bf335 Mon Sep 17 00:00:00 2001 From: Brian Nicholson Date: Wed, 1 Feb 2012 21:17:23 -0800 Subject: [PATCH] Bug 719900 - Remove blank favicon images from awesomebar lists. r=mfinkle --- mobile/android/base/AwesomeBarTabs.java | 4 ++-- mobile/android/base/resources/layout/awesomebar_row.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mobile/android/base/AwesomeBarTabs.java b/mobile/android/base/AwesomeBarTabs.java index 3f32823dc00..5b86807d2ee 100644 --- a/mobile/android/base/AwesomeBarTabs.java +++ b/mobile/android/base/AwesomeBarTabs.java @@ -134,7 +134,7 @@ public class AwesomeBarTabs extends TabHost { ImageView favicon = (ImageView) childView.findViewById(R.id.favicon); if (b == null) { - favicon.setImageResource(R.drawable.favicon); + favicon.setImageResource(android.R.id.empty); } else { Bitmap bitmap = BitmapFactory.decodeByteArray(b, 0, b.length); favicon.setImageBitmap(bitmap); @@ -150,7 +150,7 @@ public class AwesomeBarTabs extends TabHost { ImageView favicon = (ImageView) view; if (b == null) { - favicon.setImageResource(R.drawable.favicon); + favicon.setImageResource(android.R.id.empty); } else { Bitmap bitmap = BitmapFactory.decodeByteArray(b, 0, b.length); favicon.setImageBitmap(bitmap); diff --git a/mobile/android/base/resources/layout/awesomebar_row.xml b/mobile/android/base/resources/layout/awesomebar_row.xml index 2e7a4b50297..45b01aed03e 100644 --- a/mobile/android/base/resources/layout/awesomebar_row.xml +++ b/mobile/android/base/resources/layout/awesomebar_row.xml @@ -11,7 +11,7 @@ android:layout_centerVertical="true" android:minWidth="32dip" android:minHeight="32dip" - android:src="@drawable/favicon" + android:src="@android:id/empty" android:scaleType="fitCenter"/>