From 86314b6734dd678ef95080f859782ffb9fcf081b Mon Sep 17 00:00:00 2001 From: Sriram Ramasubramanian Date: Fri, 3 Feb 2012 11:22:36 -0800 Subject: [PATCH] Bug 723899: There is no "empty" resource in ICS. [r=mfinkle] --- mobile/android/base/AwesomeBarTabs.java | 4 ++-- mobile/android/base/resources/layout/awesomebar_row.xml | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mobile/android/base/AwesomeBarTabs.java b/mobile/android/base/AwesomeBarTabs.java index 5b86807d2eef..c7a442acd24a 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(android.R.id.empty); + favicon.setImageDrawable(null); } 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(android.R.id.empty); + favicon.setImageDrawable(null); } 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 45b01aed03e8..3f7bf7db9f64 100644 --- a/mobile/android/base/resources/layout/awesomebar_row.xml +++ b/mobile/android/base/resources/layout/awesomebar_row.xml @@ -11,7 +11,6 @@ android:layout_centerVertical="true" android:minWidth="32dip" android:minHeight="32dip" - android:src="@android:id/empty" android:scaleType="fitCenter"/>