UI theme work
fixed styles for action bar
changed URLInput layout
suppress selection acion mode for url input
Change-Id: Ia5dbab792057b7d172e797c01f07f06ca190c88b
diff --git a/res/drawable-mdpi/ic_add_string.png b/res/drawable-mdpi/ic_add_string.png
new file mode 100644
index 0000000..e3b95cb
--- /dev/null
+++ b/res/drawable-mdpi/ic_add_string.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_favorite_on_dark.png b/res/drawable-mdpi/ic_favorite_on_dark.png
new file mode 100644
index 0000000..50563c1
--- /dev/null
+++ b/res/drawable-mdpi/ic_favorite_on_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_go_dark.png b/res/drawable-mdpi/ic_go_dark.png
new file mode 100644
index 0000000..88c0985
--- /dev/null
+++ b/res/drawable-mdpi/ic_go_dark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_cab_close.png b/res/drawable-mdpi/ic_menu_cab_close.png
new file mode 100644
index 0000000..3451027
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_cab_close.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_cab_pencil.png b/res/drawable-mdpi/ic_menu_cab_pencil.png
new file mode 100644
index 0000000..5d6ab57
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_cab_pencil.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_overflow.png b/res/drawable-mdpi/ic_menu_overflow.png
new file mode 100644
index 0000000..e565760
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_overflow.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_pressed.png b/res/drawable-mdpi/ic_pressed.png
index dccdc83..fd1c7d9 100644
--- a/res/drawable-mdpi/ic_pressed.png
+++ b/res/drawable-mdpi/ic_pressed.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_search_catgeory_browser.png b/res/drawable-mdpi/ic_search_category_browser.png
similarity index 100%
rename from res/drawable-mdpi/ic_search_catgeory_browser.png
rename to res/drawable-mdpi/ic_search_category_browser.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_search_category_suggest.png b/res/drawable-mdpi/ic_search_category_suggest.png
old mode 100755
new mode 100644
index a4ed7aa..0216581
--- a/res/drawable-mdpi/ic_search_category_suggest.png
+++ b/res/drawable-mdpi/ic_search_category_suggest.png
Binary files differ
diff --git a/res/drawable-mdpi/menu_dropdown.9.png b/res/drawable-mdpi/menu_dropdown.9.png
new file mode 100644
index 0000000..562d55b
--- /dev/null
+++ b/res/drawable-mdpi/menu_dropdown.9.png
Binary files differ
diff --git a/res/drawable-mdpi/tab_selected_bg.9.png b/res/drawable-mdpi/tab_selected_bg.9.png
index 2004313..261982e 100644
--- a/res/drawable-mdpi/tab_selected_bg.9.png
+++ b/res/drawable-mdpi/tab_selected_bg.9.png
Binary files differ
diff --git a/res/drawable-mdpi/text_field_results.9.png b/res/drawable-mdpi/text_field_results.9.png
index 5d08fe9..167c42d 100644
--- a/res/drawable-mdpi/text_field_results.9.png
+++ b/res/drawable-mdpi/text_field_results.9.png
Binary files differ
diff --git a/res/drawable-mdpi/urlbar_bg.9.png b/res/drawable-mdpi/urlbar_bg.9.png
index eccf41b..18b49e7 100644
--- a/res/drawable-mdpi/urlbar_bg.9.png
+++ b/res/drawable-mdpi/urlbar_bg.9.png
Binary files differ
diff --git a/res/layout/url_bar.xml b/res/layout/url_bar.xml
index 29a6462..b803881 100644
--- a/res/layout/url_bar.xml
+++ b/res/layout/url_bar.xml
@@ -54,10 +54,11 @@
android:background="@drawable/browserbarbutton"
android:src="@drawable/ic_bookmarks_history_normal" />
<LinearLayout
- android:id="@+id/urlbar"
+ 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"
@@ -72,15 +73,14 @@
android:layout_height="wrap_content"
style="@style/HoloIcon"
android:visibility="gone" />
- <com.android.browser.UrlInputView
- android:id="@+id/editurl"
+ <EditText
+ android:id="@+id/url_unfocused"
android:layout_width="0dip"
android:layout_weight="1.0"
android:layout_height="match_parent"
android:background="@null"
- android:paddingLeft="16dip"
- android:paddingRight="16dip"
android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textColor="#ffc0c0c0"
android:hint="@string/search_hint"
android:gravity="center_vertical"
android:singleLine="true"
@@ -98,6 +98,46 @@
style="@style/HoloButton"
android:background="@drawable/browserbarbutton" />
</LinearLayout>
+ <LinearLayout
+ android:id="@+id/urlbar_focused"
+ android:layout_width="0dip"
+ android:layout_height="match_parent"
+ android:layout_weight="1.0"
+ android:orientation="horizontal"
+ android:background="@drawable/text_field_results"
+ android:visibility="gone"
+ >
+ <ImageView
+ android:id="@+id/searchicon"
+ android:src="@drawable/ic_search_category_suggest"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ style="@style/HoloButton" />
+ <com.android.browser.UrlInputView
+ android:id="@+id/url_focused"
+ android:layout_width="0dip"
+ android:layout_weight="1.0"
+ android:layout_height="match_parent"
+ android:background="@null"
+ 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:inputType="textUri"
+ android:imeOptions="actionGo" />
+ <ImageButton
+ android:id="@+id/go"
+ android:src="@drawable/ic_go_dark"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical"
+ style="@style/HoloButton"
+ android:background="@drawable/browserbarbutton" />
+ </LinearLayout>
</LinearLayout>
<com.android.browser.PageProgressView
android:id="@+id/progress"
diff --git a/res/layout/simple_dropdown_item_2line.xml b/res/layout/url_dropdown_item.xml
similarity index 79%
rename from res/layout/simple_dropdown_item_2line.xml
rename to res/layout/url_dropdown_item.xml
index 8b955ec..5e8f84c 100644
--- a/res/layout/simple_dropdown_item_2line.xml
+++ b/res/layout/url_dropdown_item.xml
@@ -2,7 +2,7 @@
<!--
/* //device/apps/common/assets/res/any/layout/simple_spinner_item.xml
**
-** Copyright 2008, The Android Open Source Project
+** Copyright 2010, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="?android:attr/listPreferredItemHeight"
+ android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical"
android:baselineAligned="false">
@@ -30,11 +30,10 @@
android:layout_height="wrap_content"
android:id="@+id/icon1"
android:scaleType="center"
- android:paddingLeft="2dip"
- android:paddingRight="2dip" />
+ style="@style/HoloButton" />
<TwoLineListItem
- android:paddingTop="2dip"
- android:paddingBottom="2dip"
+ android:paddingTop="16dip"
+ android:paddingBottom="16dip"
android:layout_width="0dip"
android:layout_weight="1"
android:layout_height="wrap_content"
@@ -57,4 +56,13 @@
android:layout_below="@android:id/text1"
android:layout_alignLeft="@android:id/text1" />
</TwoLineListItem>
+ <ImageButton
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/icon2"
+ android:scaleType="center"
+ style="@style/HoloButton"
+ android:src="@drawable/ic_add_string"
+ android:background="@drawable/browserbarbutton"
+ />
</LinearLayout>
diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml
index d48a502..0f17da3 100644
--- a/res/values-xlarge/styles.xml
+++ b/res/values-xlarge/styles.xml
@@ -26,6 +26,10 @@
<item name="android:actionBarStyle">@style/ActionBarStyle</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:actionModeBackground">@drawable/cab_bg</item>
+ <item name="android:actionModeCloseDrawable">@drawable/ic_menu_cab_close</item>
+ <item name="android:actionButtonStyle">@style/ActionButton</item>
+ <item name="android:actionDropDownStyle">@style/ActionDropdown</item>
+ <item name="android:actionOverflowButtonStyle">@style/Overflow</item>
</style>
<style name="Dialog.Holo" parent="android:Theme.Holo">
<item name="android:windowFrame">@null</item>
@@ -47,6 +51,18 @@
<item name="android:padding">0dip</item>
<item name="android:displayOptions">hideHome</item>
</style>
+ <style name="ActionButton">
+ <item name="android:height">12dip</item>
+ <item name="android:background">@drawable/browserbarbutton</item>
+ </style>
+ <style name="ActionDropdown">
+ <item name="android:background">@drawable/menu_dropdown</item>
+ </style>
+ <style name="Overflow">
+ <item name="android:src">@drawable/ic_menu_overflow</item>
+ <item name="android:paddingLeft">16dip</item>
+ <item name="android:paddingRight">16dip</item>
+ </style>
<style name="TitleBar">
<item name="android:windowEnterAnimation">@anim/title_bar_enter</item>
<item name="android:windowExitAnimation">@anim/title_bar_exit</item>
