another round of UI refresh
moved buttons in the url bar
fixed selected tab visuals (activated)
Change-Id: Ib69f9ca68b3d8cc8dfe6856f7248f21267127ae8
diff --git a/res/drawable-hdpi/ic_clear_search.png b/res/drawable-hdpi/ic_clear_search.png
new file mode 100644
index 0000000..e8e67b4
--- /dev/null
+++ b/res/drawable-hdpi/ic_clear_search.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_favorite_off_normal.png b/res/drawable-hdpi/ic_favorite_off_normal.png
new file mode 100644
index 0000000..4741464
--- /dev/null
+++ b/res/drawable-hdpi/ic_favorite_off_normal.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_go_normal_white.png b/res/drawable-hdpi/ic_go_normal_white.png
new file mode 100644
index 0000000..1ae9ed9
--- /dev/null
+++ b/res/drawable-hdpi/ic_go_normal_white.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_web_white.png b/res/drawable-hdpi/ic_web_white.png
new file mode 100644
index 0000000..fec99ca
--- /dev/null
+++ b/res/drawable-hdpi/ic_web_white.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_clear_search.png b/res/drawable-mdpi/ic_clear_search.png
new file mode 100644
index 0000000..e8e67b4
--- /dev/null
+++ b/res/drawable-mdpi/ic_clear_search.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_favorite_off_normal.png b/res/drawable-mdpi/ic_favorite_off_normal.png
new file mode 100644
index 0000000..4741464
--- /dev/null
+++ b/res/drawable-mdpi/ic_favorite_off_normal.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_go_normal_white.png b/res/drawable-mdpi/ic_go_normal_white.png
new file mode 100644
index 0000000..1ae9ed9
--- /dev/null
+++ b/res/drawable-mdpi/ic_go_normal_white.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_web_white.png b/res/drawable-mdpi/ic_web_white.png
new file mode 100644
index 0000000..fec99ca
--- /dev/null
+++ b/res/drawable-mdpi/ic_web_white.png
Binary files differ
diff --git a/res/drawable/tab_background.xml b/res/drawable/tab_background.xml
index 8e1881e..6fc3ee3 100644
--- a/res/drawable/tab_background.xml
+++ b/res/drawable/tab_background.xml
@@ -17,10 +17,10 @@
<selector
xmlns:android="http://schemas.android.com/apk/res/android">
<item
- android:state_selected="true"
+ android:state_activated="true"
android:drawable="@drawable/tab_selected_bg" />
<item
- android:state_selected="false"
+ android:state_activated="false"
android:drawable="@drawable/tab_unselected_bg">
</item>
</selector>
diff --git a/res/layout/url_bar.xml b/res/layout/url_bar.xml
index b803881..e85ad83 100644
--- a/res/layout/url_bar.xml
+++ b/res/layout/url_bar.xml
@@ -21,8 +21,7 @@
android:layout_width="match_parent"
android:layout_height="48dip"
android:orientation="horizontal"
- android:background="@drawable/urlbar_bg"
- >
+ android:background="@drawable/urlbar_bg">
<ImageButton
android:id="@+id/back"
android:src="@drawable/ic_back_normal"
@@ -45,28 +44,19 @@
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_unfocused"
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1.0"
android:background="@null"
- android:orientation="horizontal" >
- <ImageButton
- android:id="@+id/star"
- android:src="@drawable/ic_favorite_on_normal"
+ android:orientation="horizontal">
+ <ImageView
+ android:id="@+id/browsericon"
+ android:src="@drawable/ic_web_white"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- style="@style/HoloButton"
- android:background="@drawable/browserbarbutton" />
+ style="@style/HoloButton" />
<ImageView
android:id="@+id/lock"
android:layout_width="wrap_content"
@@ -90,11 +80,10 @@
android:inputType="textUri"
android:imeOptions="actionGo" />
<ImageButton
- android:id="@+id/search"
- android:src="@drawable/ic_search_normal"
+ android:id="@+id/star"
+ android:src="@drawable/ic_favorite_off_normal"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:gravity="center_vertical"
style="@style/HoloButton"
android:background="@drawable/browserbarbutton" />
</LinearLayout>
@@ -105,8 +94,7 @@
android:layout_weight="1.0"
android:orientation="horizontal"
android:background="@drawable/text_field_results"
- android:visibility="gone"
- >
+ android:visibility="gone">
<ImageView
android:id="@+id/searchicon"
android:src="@drawable/ic_search_category_suggest"
@@ -129,22 +117,45 @@
android:scrollHorizontally="true"
android:inputType="textUri"
android:imeOptions="actionGo" />
- <ImageButton
- android:id="@+id/go"
- android:src="@drawable/ic_go_dark"
+ <ImageView
+ android:id="@+id/clear"
+ android:src="@drawable/ic_clear_search"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:gravity="center_vertical"
- style="@style/HoloButton"
- android:background="@drawable/browserbarbutton" />
+ style="@style/HoloButton" />
</LinearLayout>
+ <ImageButton
+ android:id="@+id/go"
+ android:src="@drawable/ic_go_normal_white"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:visibility="gone"
+ android:gravity="center_vertical"
+ style="@style/HoloButton"
+ android:background="@drawable/browserbarbutton" />
+ <ImageButton
+ android:id="@+id/search"
+ android:src="@drawable/ic_search_normal"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical"
+ style="@style/HoloButton"
+ android:background="@drawable/browserbarbutton" />
+ <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>
<com.android.browser.PageProgressView
android:id="@+id/progress"
android:layout_width="match_parent"
android:layout_height="22dip"
- android:background = "@null"
- android:src = "@drawable/progress"
+ android:background="@null"
+ android:src="@drawable/progress"
android:layout_marginTop="-11dip"
android:visibility="gone" />
</LinearLayout>
