From 5a4372f4638f9a1fc5c052d85977fbcc0c4d8c55 Mon Sep 17 00:00:00 2001
From: Michael Kolb <kolby@google.com>
Date: Fri, 29 Apr 2011 13:53:10 -0700
Subject: fix phone titlebar

Change-Id: I76908b1cf4eb61f64c3531c75e589f1b80bdaaba
---
 res/layout/nav_tab_view.xml | 7 ++-----
 res/layout/title_bar.xml    | 6 +++---
 res/values/dimensions.xml   | 2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'res')

diff --git a/res/layout/nav_tab_view.xml b/res/layout/nav_tab_view.xml
index f9e471b..439eb89 100644
--- a/res/layout/nav_tab_view.xml
+++ b/res/layout/nav_tab_view.xml
@@ -30,13 +30,10 @@
         android:layout_height="@dimen/toolbar_height" >
         <ImageView
             android:id="@+id/favicon"
-            android:layout_width="22dip"
-            android:layout_height="22dip"
+            android:layout_width="20dip"
+            android:layout_height="20dip"
             android:layout_marginLeft="4dip"
             android:layout_marginRight="4dip"
-            android:background="@color/white"
-            android:scaleType="center"
-            android:src="@drawable/app_web_browser_sm"
             android:layout_gravity="center_vertical" />
         <TextView
             android:id="@+id/title"
diff --git a/res/layout/title_bar.xml b/res/layout/title_bar.xml
index 35d3611..d00a56c 100644
--- a/res/layout/title_bar.xml
+++ b/res/layout/title_bar.xml
@@ -22,7 +22,7 @@
     <LinearLayout
         android:id="@+id/taburlbar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/toolbar_height"
         android:orientation="horizontal"
         android:background="@drawable/bg_urlbar"
         android:paddingLeft="4dip"
@@ -33,7 +33,7 @@
             android:id="@+id/title_bg"
             android:layout_width="0dip"
             android:layout_weight="1.0"
-            android:layout_height="40dip"
+            android:layout_height="match_parent"
             android:gravity="center_vertical"
             android:orientation="horizontal">
             <ImageView
@@ -55,7 +55,7 @@
                 android:layout_marginLeft="2dip"
                 android:paddingLeft="4dip"
                 android:paddingRight="4dip"
-                android:background="@drawable/url_selector"
+                android:background="@*android:drawable/edit_text_holo_dark"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:hint="@string/search_hint"
                 android:singleLine="true"
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index 4d1c534..5b962d8 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -66,5 +66,5 @@
     <dimen name="preference_widget_width">56dp</dimen>
     <dimen name="nav_tab_spacing">8dp</dimen>
     <dimen name="menu_width">240dip</dimen>
-    <dimen name="toolbar_height">40dip</dimen>
+    <dimen name="toolbar_height">52dip</dimen>
 </resources>
-- 
cgit v1.1