checkpoint for moving UI to Holo style
mostly final assets
dialogs are not styled correctly
Change-Id: Ib98312ca9465ded3efc2743f9828fe9a815814cc
diff --git a/res/layout/browser_add_bookmark.xml b/res/layout/browser_add_bookmark.xml
index e8a08a4..f15caf2 100644
--- a/res/layout/browser_add_bookmark.xml
+++ b/res/layout/browser_add_bookmark.xml
@@ -80,7 +80,6 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="#c6c3c6"
android:minHeight="54dip"
android:orientation="horizontal"
android:paddingTop="4dip"
diff --git a/res/layout/browser_add_bookmark_const_url.xml b/res/layout/browser_add_bookmark_const_url.xml
index c6603f4..6a6d78f 100644
--- a/res/layout/browser_add_bookmark_const_url.xml
+++ b/res/layout/browser_add_bookmark_const_url.xml
@@ -53,15 +53,13 @@
android:layout_width="250dip"
android:gravity="fill_horizontal"
android:inputType="textCapSentences"
- android:selectAllOnFocus="true"
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:selectAllOnFocus="true" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="#c6c3c6"
android:minHeight="54dip"
android:orientation="horizontal"
android:paddingTop="4dip"
diff --git a/res/layout/tab_bar.xml b/res/layout/tab_bar.xml
index 0b3fae1..7967307 100644
--- a/res/layout/tab_bar.xml
+++ b/res/layout/tab_bar.xml
@@ -14,21 +14,13 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/tabbarcontent"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="48dip"
style="@style/ActionBarStyle"
android:orientation="horizontal">
- <ImageButton
- android:id="@+id/showurl"
- android:src="@drawable/ic_menu_showurl"
- android:layout_width="48dip"
- android:layout_height="48dip"
- android:layout_marginLeft="3dip"
- android:background="@drawable/browserbarbutton"
- android:visibility="gone" />
<com.android.browser.TabScrollView
android:id="@+id/tabs"
android:layout_width="0dp"
- android:layout_height="48dip"
+ android:layout_height="match_parent"
android:layout_weight="1.0"
android:orientation="horizontal" />
</LinearLayout>
diff --git a/res/layout/tab_title.xml b/res/layout/tab_title.xml
index d3d5176..a2da03d 100644
--- a/res/layout/tab_title.xml
+++ b/res/layout/tab_title.xml
@@ -12,45 +12,50 @@
-->
<merge
xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="0dip"
- android:layout_weight="1.0"
+ android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:orientation="horizontal"
- android:background="@drawable/tab_background" >
+ android:background="@drawable/tab_background">
<ImageView
android:id="@+id/incognito"
- android:layout_width="36dip"
- android:layout_height="36dip"
+ android:layout_width="16dip"
+ android:layout_height="16dip"
android:layout_marginLeft="3dip"
- android:src="@drawable/ic_menu_incognito"
+ android:gravity="center_vertical"
+ android:src="@drawable/fav_incognito"
android:visibility="gone" />
<ImageView
android:id="@+id/favicon"
android:layout_width="20dip"
android:layout_height="20dip"
- android:layout_marginLeft="3dip" />
+ android:layout_marginLeft="16dip" />
<ImageView
android:id="@+id/lock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="6dip"
+ android:layout_marginLeft="16dip"
android:visibility="gone" />
<TextView
android:id="@+id/title"
android:layout_height="match_parent"
android:layout_width="0dip"
android:layout_weight="1.0"
- android:layout_marginLeft="3dip"
+ android:layout_marginLeft="16dip"
android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="@color/black"
- android:gravity="center_vertical|center_horizontal"
- android:singleLine="true"
- android:ellipsize="end" />
- <ImageView
+ android:textColor="@color/white"
+ android:gravity="center_vertical"
+ android:scrollHorizontally="true"
+ android:fadingEdge="horizontal"
+ android:fadingEdgeLength="24dip"
+ android:lines="1"
+ android:singleLine="true" />
+ <ImageButton
android:id="@+id/close"
+ android:background="@drawable/browserbarbutton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="6dip"
- android:src="@drawable/btn_close_window" />
+ android:layout_marginLeft="16dip"
+ android:layout_marginRight="16dip"
+ android:src="@drawable/ic_tab_close" />
</merge>
diff --git a/res/layout/url_bar.xml b/res/layout/url_bar.xml
index a8e5a8d..29a6462 100644
--- a/res/layout/url_bar.xml
+++ b/res/layout/url_bar.xml
@@ -19,95 +19,92 @@
<LinearLayout
android:id="@+id/taburlbar"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="48dip"
android:orientation="horizontal"
- android:background="#ffdddddd"
- android:paddingLeft="6dip"
- android:paddingRight="6dip"
- android:paddingTop="2dip"
- android:paddingBottom="2dip">
+ android:background="@drawable/urlbar_bg"
+ >
<ImageButton
android:id="@+id/back"
- android:src="@drawable/ic_arrow_left"
+ android:src="@drawable/ic_back_normal"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_marginRight="6dip"
+ style="@style/HoloButton"
android:background="@drawable/browserbarbutton" />
<ImageButton
android:id="@+id/forward"
- android:src="@drawable/ic_arrow_right"
+ android:src="@drawable/ic_forward_normal"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_marginRight="6dip"
+ style="@style/HoloButton"
android:background="@drawable/browserbarbutton" />
+ <ImageView
+ android:id="@+id/stop"
+ android:background="@drawable/browserbarbutton"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ style="@style/HoloButton"
+ android:gravity="center_vertical"
+ android:src="@drawable/ic_stop_normal" />
+ <ImageButton
+ android:id="@+id/all_btn"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:scaleType="center"
+ style="@style/HoloButton"
+ android:background="@drawable/browserbarbutton"
+ android:src="@drawable/ic_bookmarks_history_normal" />
<LinearLayout
android:id="@+id/urlbar"
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1.0"
- android:orientation="horizontal"
- android:background="#ffffffff">
+ android:orientation="horizontal" >
<ImageButton
android:id="@+id/star"
- android:src="@drawable/ic_star"
+ android:src="@drawable/ic_favorite_on_normal"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_marginLeft="6dip"
+ style="@style/HoloButton"
android:background="@drawable/browserbarbutton" />
<ImageView
android:id="@+id/lock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="6dip"
+ style="@style/HoloIcon"
android:visibility="gone" />
<com.android.browser.UrlInputView
android:id="@+id/editurl"
android:layout_width="0dip"
android:layout_weight="1.0"
android:layout_height="match_parent"
- android:layout_marginLeft="6dip"
+ android:background="@null"
+ android:paddingLeft="16dip"
+ android:paddingRight="16dip"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="@color/black"
android:hint="@string/search_hint"
android:gravity="center_vertical"
android:singleLine="true"
android:ellipsize="end"
android:lines="1"
android:scrollHorizontally="true"
- android:background="@null"
android:inputType="textUri"
android:imeOptions="actionGo" />
- <ImageView
- android:id="@+id/stop"
- android:background="@drawable/browserbarbutton"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_marginLeft="6dip"
- android:gravity="center_vertical"
- android:src="@drawable/ic_stop" />
<ImageButton
android:id="@+id/search"
- android:src="@drawable/ic_btn_find"
+ android:src="@drawable/ic_search_normal"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
- android:layout_marginLeft="6dip"
- android:layout_marginRight="6dip"
+ style="@style/HoloButton"
android:background="@drawable/browserbarbutton" />
</LinearLayout>
- <ImageButton
- android:id="@+id/all_btn"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:scaleType="center"
- android:layout_marginLeft="6dip"
- android:background="@drawable/browserbarbutton"
- android:src="@drawable/ic_pages" />
</LinearLayout>
- <ImageView
+ <com.android.browser.PageProgressView
android:id="@+id/progress"
android:layout_width="match_parent"
- android:layout_height="8dip"
- android:src="@drawable/progress"
+ android:layout_height="22dip"
+ android:background = "@null"
+ android:src = "@drawable/progress"
+ android:layout_marginTop="-11dip"
android:visibility="gone" />
</LinearLayout>