Merge "Switch omnibox to dark theme"
diff --git a/res/drawable-hdpi/ic_querybuilder_disabled.png b/res/drawable-hdpi/ic_querybuilder_disabled.png
new file mode 100644
index 0000000..0c3e19f
--- /dev/null
+++ b/res/drawable-hdpi/ic_querybuilder_disabled.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_querybuilder_normal.png b/res/drawable-hdpi/ic_querybuilder_normal.png
new file mode 100644
index 0000000..e0f00d4
--- /dev/null
+++ b/res/drawable-hdpi/ic_querybuilder_normal.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_querybuilder_pressed.png b/res/drawable-hdpi/ic_querybuilder_pressed.png
new file mode 100644
index 0000000..dd99be5
--- /dev/null
+++ b/res/drawable-hdpi/ic_querybuilder_pressed.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_search_category_bookmark.png b/res/drawable-hdpi/ic_search_category_bookmark.png
index 017df48..bb15e3b 100644
--- a/res/drawable-hdpi/ic_search_category_bookmark.png
+++ b/res/drawable-hdpi/ic_search_category_bookmark.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_search_category_browser.png b/res/drawable-hdpi/ic_search_category_browser.png
index 05b3324..4406c8c 100644
--- a/res/drawable-hdpi/ic_search_category_browser.png
+++ b/res/drawable-hdpi/ic_search_category_browser.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_search_category_history.png b/res/drawable-hdpi/ic_search_category_history.png
index 6eac1c5..adec7f8 100644
--- a/res/drawable-hdpi/ic_search_category_history.png
+++ b/res/drawable-hdpi/ic_search_category_history.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_querybuilder_disabled.png b/res/drawable-mdpi/ic_querybuilder_disabled.png
new file mode 100644
index 0000000..f1a1f88
--- /dev/null
+++ b/res/drawable-mdpi/ic_querybuilder_disabled.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_querybuilder_normal.png b/res/drawable-mdpi/ic_querybuilder_normal.png
new file mode 100644
index 0000000..723ef56
--- /dev/null
+++ b/res/drawable-mdpi/ic_querybuilder_normal.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_querybuilder_pressed.png b/res/drawable-mdpi/ic_querybuilder_pressed.png
new file mode 100644
index 0000000..4327e77
--- /dev/null
+++ b/res/drawable-mdpi/ic_querybuilder_pressed.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_search_category_bookmark.png b/res/drawable-mdpi/ic_search_category_bookmark.png
index 4b3bd2d..dd90de8 100644
--- a/res/drawable-mdpi/ic_search_category_bookmark.png
+++ b/res/drawable-mdpi/ic_search_category_bookmark.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_search_category_browser.png b/res/drawable-mdpi/ic_search_category_browser.png
index d721425..2a43b1b 100644
--- a/res/drawable-mdpi/ic_search_category_browser.png
+++ b/res/drawable-mdpi/ic_search_category_browser.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_search_category_history.png b/res/drawable-mdpi/ic_search_category_history.png
index 1a3fc98..eca66cc 100644
--- a/res/drawable-mdpi/ic_search_category_history.png
+++ b/res/drawable-mdpi/ic_search_category_history.png
Binary files differ
diff --git a/res/drawable/ic_querybuilder.xml b/res/drawable/ic_querybuilder.xml
new file mode 100644
index 0000000..9522945
--- /dev/null
+++ b/res/drawable/ic_querybuilder.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_enabled="false"
+ android:drawable="@drawable/ic_querybuilder_disabled" />
+
+ <item android:state_enabled="true" android:state_pressed="true"
+ android:drawable="@drawable/ic_querybuilder_pressed" />
+
+ <item android:state_enabled="true" android:state_focused="true"
+ android:state_window_focused="true"
+ android:drawable="@drawable/ic_querybuilder_pressed" />
+
+ <item android:state_enabled="true" android:state_selected="true"
+ android:drawable="@drawable/ic_querybuilder_pressed" />
+
+ <item android:state_enabled="true"
+ android:drawable="@drawable/ic_querybuilder_normal" />
+</selector>
diff --git a/res/layout/suggestion_item.xml b/res/layout/suggestion_item.xml
index 17b01ba..2bd5466 100644
--- a/res/layout/suggestion_item.xml
+++ b/res/layout/suggestion_item.xml
@@ -73,7 +73,7 @@
android:layout_height="match_parent"
android:id="@+id/icon2"
android:scaleType="center"
- android:src="@drawable/ic_add_string"
+ android:src="@drawable/ic_querybuilder"
android:background="@drawable/suggest_item_selector"
android:paddingRight="@dimen/suggest_item_padding"
android:paddingLeft="@dimen/suggest_item_padding"
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 4951b2e..1bd6172 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -22,4 +22,6 @@
<item name="android:actionBarStyle">@style/ActionBarStyle</item>
<item name="android:actionButtonStyle">@style/ActionButton</item>
</style>
+ <style name="Suggestions" parent="@android:style/Widget.Holo.AutoCompleteTextView">
+ </style>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 1b77509..061d600 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -48,14 +48,16 @@
<style name="ActionButton">
<item name="android:background">?android:attr/selectableItemBackground</item>
</style>
- <style name="Suggestions" parent="@android:style/Widget.Holo.Light.AutoCompleteTextView">
+ <style name="Suggestions" parent="@android:style/Widget.Holo.AutoCompleteTextView">
+ <item name="android:popupBackground">#D0000000</item>
+ <item name="android:dropDownVerticalOffset">0dip</item>
</style>
<style name="SuggestionLineMedium"
- parent="@android:style/TextAppearance.Holo.Medium.Inverse">
+ parent="@android:style/TextAppearance.Holo.Medium">
<item name="android:textSize">16sp</item>
</style>
<style name="SuggestionLineSmall"
- parent="@android:style/TextAppearance.Holo.Small.Inverse">
+ parent="@android:style/TextAppearance.Holo.Small">
<item name="android:textSize">12sp</item>
</style>
<style name="ActionBar" parent="@android:style/Widget.ActionBar">
