commit dc6cbb737dbe70fa2236c3fbf27827ed4453c686
author Justin Ho <justinho@google.com> Mon Jan 24 15:14:54 2011 -0800
committer John Reck <jreck@google.com> Mon Jan 24 16:03:18 2011 -0800
tree addfb9706b9ed9a7b4b91445651732a5cf04a76a
parent afb708a600d37ae90e1341b9b404749783a587e0

Tightening incognito mode icon spacing, switching to new asset

 Bug: 3174763

Change-Id: Ia379b06b65729d4df966094df0aa3fb2e47234a8

res/drawable-hdpi/fav_incognito.png

diff --git a/res/drawable-hdpi/fav_incognito.png b/res/drawable-hdpi/fav_incognito.png
deleted file mode 100644
index b8acde2..0000000
--- a/res/drawable-hdpi/fav_incognito.png
+++ /dev/null
Binary files differ

res/drawable-hdpi/ic_incognito_holo_dark.png

diff --git a/res/drawable-hdpi/ic_incognito_holo_dark.png b/res/drawable-hdpi/ic_incognito_holo_dark.png
index 8f7a9d4..f4997ae 100644
--- a/res/drawable-hdpi/ic_incognito_holo_dark.png
+++ b/res/drawable-hdpi/ic_incognito_holo_dark.png
Binary files differ

res/drawable-mdpi/fav_incognito.png

diff --git a/res/drawable-mdpi/fav_incognito.png b/res/drawable-mdpi/fav_incognito.png
deleted file mode 100644
index 6a120b9..0000000
--- a/res/drawable-mdpi/fav_incognito.png
+++ /dev/null
Binary files differ

res/drawable-mdpi/ic_incognito_holo_dark.png

diff --git a/res/drawable-mdpi/ic_incognito_holo_dark.png b/res/drawable-mdpi/ic_incognito_holo_dark.png
index e2e8b17..dfb380a 100644
--- a/res/drawable-mdpi/ic_incognito_holo_dark.png
+++ b/res/drawable-mdpi/ic_incognito_holo_dark.png
Binary files differ

res/layout/tab_title.xml

diff --git a/res/layout/tab_title.xml b/res/layout/tab_title.xml
index 164e9b6..0f500c7 100644
--- a/res/layout/tab_title.xml
+++ b/res/layout/tab_title.xml
@@ -26,11 +26,11 @@
         android:visibility="gone" />
     <ImageView
         android:id="@+id/incognito"
-        android:layout_width="16dip"
-        android:layout_height="16dip"
-        android:layout_marginRight="16dip"
+        android:layout_width="32dip"
+        android:layout_height="32dip"
+        android:layout_marginRight="8dip"
         android:gravity="center_vertical"
-        android:src="@drawable/fav_incognito"
+        android:src="@drawable/ic_incognito_holo_dark"
         android:visibility="gone" />
     <ImageView
         android:id="@+id/favicon"

src/com/android/browser/Tab.java

diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index 83db214..c4897f2 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -148,14 +148,12 @@
             if (incognito) {
                 mUrl = "browser:incognito";
                 mTitle = c.getString(R.string.new_incognito_tab);
-                mFavicon = BitmapFactory.decodeResource(
-                        c.getResources(), R.drawable.fav_incognito);
             } else {
                 mUrl = "";
                 mTitle = c.getString(R.string.new_tab);
-                mFavicon = BitmapFactory.decodeResource(
-                        c.getResources(), R.drawable.app_web_browser_sm);
             }
+            mFavicon = BitmapFactory.decodeResource(
+                    c.getResources(), R.drawable.app_web_browser_sm);
             mLockIcon = LockIcon.LOCK_ICON_UNSECURE;
         }
 
@@ -170,13 +168,8 @@
             if (favicon != null) {
                 mFavicon = favicon;
             } else {
-                if (incognito) {
-                    mFavicon = BitmapFactory.decodeResource(
-                            c.getResources(), R.drawable.fav_incognito);
-                } else {
-                    mFavicon = BitmapFactory.decodeResource(
-                            c.getResources(), R.drawable.app_web_browser_sm);
-                }
+                mFavicon = BitmapFactory.decodeResource(
+                        c.getResources(), R.drawable.app_web_browser_sm);
             }
         }
     }