Revert "Integrated new assets from alcor."
Reverting all the hint UI changes to implement a new UI where the hint sits
on top of the widget and has a close button.
This reverts commit aa648e63dd401db82bdf636c0bf52947c0067cf2.
diff --git a/res/drawable-hdpi/btn_dialog_disable.png b/res/drawable-hdpi/btn_dialog_disable.png
new file mode 100644
index 0000000..2fc5d1a
--- /dev/null
+++ b/res/drawable-hdpi/btn_dialog_disable.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_dialog_normal.png b/res/drawable-hdpi/btn_dialog_normal.png
new file mode 100644
index 0000000..c4a1026
--- /dev/null
+++ b/res/drawable-hdpi/btn_dialog_normal.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_dialog_pressed.png b/res/drawable-hdpi/btn_dialog_pressed.png
new file mode 100644
index 0000000..846f8bf
--- /dev/null
+++ b/res/drawable-hdpi/btn_dialog_pressed.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_dialog_selected.png b/res/drawable-hdpi/btn_dialog_selected.png
new file mode 100644
index 0000000..659c289
--- /dev/null
+++ b/res/drawable-hdpi/btn_dialog_selected.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_search_dialog_voice_default.9.png b/res/drawable-hdpi/btn_search_dialog_voice_default.9.png
new file mode 100644
index 0000000..5e361d3
--- /dev/null
+++ b/res/drawable-hdpi/btn_search_dialog_voice_default.9.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_search_dialog_voice_pressed.9.png b/res/drawable-hdpi/btn_search_dialog_voice_pressed.9.png
new file mode 100644
index 0000000..354fe71
--- /dev/null
+++ b/res/drawable-hdpi/btn_search_dialog_voice_pressed.9.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_search_dialog_voice_selected.9.png b/res/drawable-hdpi/btn_search_dialog_voice_selected.9.png
new file mode 100644
index 0000000..386d121
--- /dev/null
+++ b/res/drawable-hdpi/btn_search_dialog_voice_selected.9.png
Binary files differ
diff --git a/res/drawable-hdpi/corpus_indicator_app_normal.9.png b/res/drawable-hdpi/corpus_indicator_app_normal.9.png
deleted file mode 100644
index ffc33a0..0000000
--- a/res/drawable-hdpi/corpus_indicator_app_normal.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/corpus_indicator_app_pressed.9.png b/res/drawable-hdpi/corpus_indicator_app_pressed.9.png
deleted file mode 100644
index 8804de9..0000000
--- a/res/drawable-hdpi/corpus_indicator_app_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/corpus_indicator_app_selected.9.png b/res/drawable-hdpi/corpus_indicator_app_selected.9.png
deleted file mode 100644
index 03f9b7e..0000000
--- a/res/drawable-hdpi/corpus_indicator_app_selected.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/corpus_indicator_arrow.9.png b/res/drawable-hdpi/corpus_indicator_arrow.9.png
new file mode 100644
index 0000000..e1788bd
--- /dev/null
+++ b/res/drawable-hdpi/corpus_indicator_arrow.9.png
Binary files differ
diff --git a/res/drawable-hdpi/corpus_indicator_bg_focused.png b/res/drawable-hdpi/corpus_indicator_bg_focused.png
new file mode 100644
index 0000000..e03fc55
--- /dev/null
+++ b/res/drawable-hdpi/corpus_indicator_bg_focused.png
Binary files differ
diff --git a/res/drawable-hdpi/corpus_indicator_bg_pressed.png b/res/drawable-hdpi/corpus_indicator_bg_pressed.png
new file mode 100644
index 0000000..39a172e
--- /dev/null
+++ b/res/drawable-hdpi/corpus_indicator_bg_pressed.png
Binary files differ
diff --git a/res/drawable-hdpi/corpus_indicator_blank.9.png b/res/drawable-hdpi/corpus_indicator_blank.9.png
new file mode 100644
index 0000000..088bc5f
--- /dev/null
+++ b/res/drawable-hdpi/corpus_indicator_blank.9.png
Binary files differ
diff --git a/res/drawable-hdpi/corpus_indicator_downarrow_normal.9.png b/res/drawable-hdpi/corpus_indicator_downarrow_normal.9.png
deleted file mode 100644
index 224183f..0000000
--- a/res/drawable-hdpi/corpus_indicator_downarrow_normal.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/corpus_indicator_downarrow_pressed.9.png b/res/drawable-hdpi/corpus_indicator_downarrow_pressed.9.png
deleted file mode 100644
index 7d944b3..0000000
--- a/res/drawable-hdpi/corpus_indicator_downarrow_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/corpus_indicator_downarrow_selected.9.png b/res/drawable-hdpi/corpus_indicator_downarrow_selected.9.png
deleted file mode 100644
index 36c0e8d..0000000
--- a/res/drawable-hdpi/corpus_indicator_downarrow_selected.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/corpus_indicator_rightarrow_normal.9.png b/res/drawable-hdpi/corpus_indicator_rightarrow_normal.9.png
deleted file mode 100644
index 92ca259..0000000
--- a/res/drawable-hdpi/corpus_indicator_rightarrow_normal.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/corpus_indicator_rightarrow_pressed.9.png b/res/drawable-hdpi/corpus_indicator_rightarrow_pressed.9.png
deleted file mode 100644
index 870be47..0000000
--- a/res/drawable-hdpi/corpus_indicator_rightarrow_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/corpus_indicator_rightarrow_selected.9.png b/res/drawable-hdpi/corpus_indicator_rightarrow_selected.9.png
deleted file mode 100644
index 6488a46..0000000
--- a/res/drawable-hdpi/corpus_indicator_rightarrow_selected.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/hint_google.9.png b/res/drawable-hdpi/hint_google.9.png
index 88adfc7..714c7ee 100644
--- a/res/drawable-hdpi/hint_google.9.png
+++ b/res/drawable-hdpi/hint_google.9.png
Binary files differ
diff --git a/res/drawable-hdpi/hints_corpus_icon.png b/res/drawable-hdpi/hints_corpus_icon.png
deleted file mode 100644
index d0ed801..0000000
--- a/res/drawable-hdpi/hints_corpus_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_btn_speak_now.png b/res/drawable-hdpi/ic_btn_speak_now.png
new file mode 100644
index 0000000..45a8155
--- /dev/null
+++ b/res/drawable-hdpi/ic_btn_speak_now.png
Binary files differ
diff --git a/res/drawable-hdpi/textfield_search_empty_default.9.png b/res/drawable-hdpi/textfield_search_empty_default.9.png
index 6b01bf3..c0b84da 100644
--- a/res/drawable-hdpi/textfield_search_empty_default.9.png
+++ b/res/drawable-hdpi/textfield_search_empty_default.9.png
Binary files differ
diff --git a/res/drawable-hdpi/textfield_search_empty_pressed.9.png b/res/drawable-hdpi/textfield_search_empty_pressed.9.png
index 3eacbd0..0a0fc6b 100644
--- a/res/drawable-hdpi/textfield_search_empty_pressed.9.png
+++ b/res/drawable-hdpi/textfield_search_empty_pressed.9.png
Binary files differ
diff --git a/res/drawable-hdpi/textfield_search_empty_selected.9.png b/res/drawable-hdpi/textfield_search_empty_selected.9.png
index 7c56a8f..04813c2 100644
--- a/res/drawable-hdpi/textfield_search_empty_selected.9.png
+++ b/res/drawable-hdpi/textfield_search_empty_selected.9.png
Binary files differ
diff --git a/res/drawable-hdpi/voice_search_button_app_normal.9.png b/res/drawable-hdpi/voice_search_button_app_normal.9.png
deleted file mode 100644
index dccf537..0000000
--- a/res/drawable-hdpi/voice_search_button_app_normal.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/voice_search_button_app_pressed.9.png b/res/drawable-hdpi/voice_search_button_app_pressed.9.png
deleted file mode 100644
index 649188c..0000000
--- a/res/drawable-hdpi/voice_search_button_app_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/voice_search_button_app_selected.9.png b/res/drawable-hdpi/voice_search_button_app_selected.9.png
deleted file mode 100644
index d80604c..0000000
--- a/res/drawable-hdpi/voice_search_button_app_selected.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/voice_search_button_widget_borderless_normal.9.png b/res/drawable-hdpi/voice_search_button_widget_borderless_normal.9.png
deleted file mode 100644
index d648cce..0000000
--- a/res/drawable-hdpi/voice_search_button_widget_borderless_normal.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/voice_search_button_widget_borderless_pressed.9.png b/res/drawable-hdpi/voice_search_button_widget_borderless_pressed.9.png
deleted file mode 100644
index 112e6e1..0000000
--- a/res/drawable-hdpi/voice_search_button_widget_borderless_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/voice_search_button_widget_borderless_selected.9.png b/res/drawable-hdpi/voice_search_button_widget_borderless_selected.9.png
deleted file mode 100644
index 05da9e0..0000000
--- a/res/drawable-hdpi/voice_search_button_widget_borderless_selected.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/voice_search_button_widget_normal.9.png b/res/drawable-hdpi/voice_search_button_widget_normal.9.png
deleted file mode 100644
index dbd5d58..0000000
--- a/res/drawable-hdpi/voice_search_button_widget_normal.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/voice_search_button_widget_pressed.9.png b/res/drawable-hdpi/voice_search_button_widget_pressed.9.png
deleted file mode 100644
index c1fa494..0000000
--- a/res/drawable-hdpi/voice_search_button_widget_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/voice_search_button_widget_selected.9.png b/res/drawable-hdpi/voice_search_button_widget_selected.9.png
deleted file mode 100644
index 6be63b0..0000000
--- a/res/drawable-hdpi/voice_search_button_widget_selected.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/voice_search_hint_bg_normal.9.png b/res/drawable-hdpi/voice_search_hint_bg_normal.9.png
index a13e991..414203c 100644
--- a/res/drawable-hdpi/voice_search_hint_bg_normal.9.png
+++ b/res/drawable-hdpi/voice_search_hint_bg_normal.9.png
Binary files differ
diff --git a/res/drawable-hdpi/voice_search_hint_bg_pressed.9.png b/res/drawable-hdpi/voice_search_hint_bg_pressed.9.png
index 267443e..067b12b 100644
--- a/res/drawable-hdpi/voice_search_hint_bg_pressed.9.png
+++ b/res/drawable-hdpi/voice_search_hint_bg_pressed.9.png
Binary files differ
diff --git a/res/drawable-hdpi/voice_search_hint_bg_selected.9.png b/res/drawable-hdpi/voice_search_hint_bg_selected.9.png
index 07f6807..f60a8cc 100644
--- a/res/drawable-hdpi/voice_search_hint_bg_selected.9.png
+++ b/res/drawable-hdpi/voice_search_hint_bg_selected.9.png
Binary files differ
diff --git a/res/drawable-hdpi/voice_search_icon.png b/res/drawable-hdpi/voice_search_icon.png
deleted file mode 100644
index ccb1435..0000000
--- a/res/drawable-hdpi/voice_search_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_dialog_disable.png b/res/drawable-mdpi/btn_dialog_disable.png
new file mode 100755
index 0000000..f041cab
--- /dev/null
+++ b/res/drawable-mdpi/btn_dialog_disable.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_dialog_normal.png b/res/drawable-mdpi/btn_dialog_normal.png
new file mode 100755
index 0000000..a2d27fa
--- /dev/null
+++ b/res/drawable-mdpi/btn_dialog_normal.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_dialog_pressed.png b/res/drawable-mdpi/btn_dialog_pressed.png
new file mode 100755
index 0000000..9c9922a
--- /dev/null
+++ b/res/drawable-mdpi/btn_dialog_pressed.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_dialog_selected.png b/res/drawable-mdpi/btn_dialog_selected.png
new file mode 100755
index 0000000..7656de5
--- /dev/null
+++ b/res/drawable-mdpi/btn_dialog_selected.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_search_dialog_voice_default.9.png b/res/drawable-mdpi/btn_search_dialog_voice_default.9.png
new file mode 100644
index 0000000..bc86acd
--- /dev/null
+++ b/res/drawable-mdpi/btn_search_dialog_voice_default.9.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_search_dialog_voice_pressed.9.png b/res/drawable-mdpi/btn_search_dialog_voice_pressed.9.png
new file mode 100644
index 0000000..f4ca7f1
--- /dev/null
+++ b/res/drawable-mdpi/btn_search_dialog_voice_pressed.9.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_search_dialog_voice_selected.9.png b/res/drawable-mdpi/btn_search_dialog_voice_selected.9.png
new file mode 100644
index 0000000..d263fee
--- /dev/null
+++ b/res/drawable-mdpi/btn_search_dialog_voice_selected.9.png
Binary files differ
diff --git a/res/drawable-mdpi/corpus_indicator_arrow.9.png b/res/drawable-mdpi/corpus_indicator_arrow.9.png
new file mode 100644
index 0000000..9073dd2
--- /dev/null
+++ b/res/drawable-mdpi/corpus_indicator_arrow.9.png
Binary files differ
diff --git a/res/drawable-mdpi/corpus_indicator_bg_focused.png b/res/drawable-mdpi/corpus_indicator_bg_focused.png
new file mode 100644
index 0000000..0f82471
--- /dev/null
+++ b/res/drawable-mdpi/corpus_indicator_bg_focused.png
Binary files differ
diff --git a/res/drawable-mdpi/corpus_indicator_bg_pressed.png b/res/drawable-mdpi/corpus_indicator_bg_pressed.png
new file mode 100644
index 0000000..b00a403
--- /dev/null
+++ b/res/drawable-mdpi/corpus_indicator_bg_pressed.png
Binary files differ
diff --git a/res/drawable-mdpi/corpus_indicator_blank.9.png b/res/drawable-mdpi/corpus_indicator_blank.9.png
new file mode 100644
index 0000000..27ed46c
--- /dev/null
+++ b/res/drawable-mdpi/corpus_indicator_blank.9.png
Binary files differ
diff --git a/res/drawable-mdpi/hints_corpus_icon.png b/res/drawable-mdpi/hints_corpus_icon.png
deleted file mode 100644
index 40352c5..0000000
--- a/res/drawable-mdpi/hints_corpus_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_btn_speak_now.png b/res/drawable-mdpi/ic_btn_speak_now.png
new file mode 100644
index 0000000..83ee68b
--- /dev/null
+++ b/res/drawable-mdpi/ic_btn_speak_now.png
Binary files differ
diff --git a/res/drawable-mdpi/textfield_search_empty_default.9.png b/res/drawable-mdpi/textfield_search_empty_default.9.png
index 7bb81d9..515117f 100644
--- a/res/drawable-mdpi/textfield_search_empty_default.9.png
+++ b/res/drawable-mdpi/textfield_search_empty_default.9.png
Binary files differ
diff --git a/res/drawable-mdpi/textfield_search_empty_pressed.9.png b/res/drawable-mdpi/textfield_search_empty_pressed.9.png
index dd67901..a01f763 100644
--- a/res/drawable-mdpi/textfield_search_empty_pressed.9.png
+++ b/res/drawable-mdpi/textfield_search_empty_pressed.9.png
Binary files differ
diff --git a/res/drawable-mdpi/textfield_search_empty_selected.9.png b/res/drawable-mdpi/textfield_search_empty_selected.9.png
index d7b181a..611276f 100644
--- a/res/drawable-mdpi/textfield_search_empty_selected.9.png
+++ b/res/drawable-mdpi/textfield_search_empty_selected.9.png
Binary files differ
diff --git a/res/drawable-mdpi/voice_search_hint_bg_normal.9.png b/res/drawable-mdpi/voice_search_hint_bg_normal.9.png
index e9ee066..d986f4c 100644
--- a/res/drawable-mdpi/voice_search_hint_bg_normal.9.png
+++ b/res/drawable-mdpi/voice_search_hint_bg_normal.9.png
Binary files differ
diff --git a/res/drawable-mdpi/voice_search_hint_bg_pressed.9.png b/res/drawable-mdpi/voice_search_hint_bg_pressed.9.png
index 69a4e8b..fd65733 100644
--- a/res/drawable-mdpi/voice_search_hint_bg_pressed.9.png
+++ b/res/drawable-mdpi/voice_search_hint_bg_pressed.9.png
Binary files differ
diff --git a/res/drawable-mdpi/voice_search_hint_bg_selected.9.png b/res/drawable-mdpi/voice_search_hint_bg_selected.9.png
index 96bf738..f52007e 100644
--- a/res/drawable-mdpi/voice_search_hint_bg_selected.9.png
+++ b/res/drawable-mdpi/voice_search_hint_bg_selected.9.png
Binary files differ
diff --git a/res/drawable-mdpi/voice_search_icon.png b/res/drawable-mdpi/voice_search_icon.png
deleted file mode 100644
index b279cb0..0000000
--- a/res/drawable-mdpi/voice_search_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/voice_search_button_widget_bg.xml b/res/drawable/btn_dialog.xml
similarity index 66%
rename from res/drawable/voice_search_button_widget_bg.xml
rename to res/drawable/btn_dialog.xml
index 2b62fba..d1d7e29 100644
--- a/res/drawable/voice_search_button_widget_bg.xml
+++ b/res/drawable/btn_dialog.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
+<!-- Copyright (C) 2007 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.
@@ -15,16 +15,14 @@
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
<item android:state_window_focused="false" android:state_enabled="true"
- android:drawable="@drawable/voice_search_button_widget_normal" />
-
+ android:drawable="@drawable/btn_dialog_normal" />
+ <item android:state_window_focused="false" android:state_enabled="false"
+ android:drawable="@drawable/btn_dialog_disable" />
<item android:state_pressed="true"
- android:drawable="@drawable/voice_search_button_widget_pressed" />
-
+ android:drawable="@drawable/btn_dialog_pressed" />
<item android:state_enabled="true" android:state_focused="true"
- android:drawable="@drawable/voice_search_button_widget_selected" />
-
- <item android:drawable="@drawable/voice_search_button_widget_normal" />
-
+ android:drawable="@drawable/btn_dialog_selected" />
+ <item android:drawable="@drawable/btn_dialog_normal" />
</selector>
+
diff --git a/res/drawable/btn_search_dialog_voice.xml b/res/drawable/btn_search_dialog_voice.xml
new file mode 100644
index 0000000..748aaf5
--- /dev/null
+++ b/res/drawable/btn_search_dialog_voice.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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_window_focused="false" android:state_enabled="true"
+ android:drawable="@drawable/btn_search_dialog_voice_default" />
+
+ <item android:state_pressed="true"
+ android:drawable="@drawable/btn_search_dialog_voice_pressed" />
+
+ <item android:state_focused="true" android:state_enabled="true"
+ android:drawable="@drawable/btn_search_dialog_voice_selected" />
+
+ <item android:state_enabled="true"
+ android:drawable="@drawable/btn_search_dialog_voice_default" />
+
+ <item
+ android:drawable="@drawable/btn_search_dialog_voice_default" />
+</selector>
diff --git a/res/drawable/corpus_indicator_app_bg.xml b/res/drawable/corpus_indicator_bg.xml
similarity index 71%
rename from res/drawable/corpus_indicator_app_bg.xml
rename to res/drawable/corpus_indicator_bg.xml
index 0961e2e..995d2d2 100644
--- a/res/drawable/corpus_indicator_app_bg.xml
+++ b/res/drawable/corpus_indicator_bg.xml
@@ -17,14 +17,15 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_window_focused="false" android:state_enabled="true"
- android:drawable="@drawable/corpus_indicator_app_normal" />
+ android:drawable="@drawable/corpus_indicator_arrow" />
<item android:state_pressed="true"
- android:drawable="@drawable/corpus_indicator_app_pressed" />
+ android:drawable="@drawable/corpus_indicator_bg_pressed_arrow" />
- <item android:state_enabled="true" android:state_focused="true"
- android:drawable="@drawable/corpus_indicator_app_selected" />
+ <item android:state_focused="true"
+ android:drawable="@drawable/corpus_indicator_bg_focused_arrow" />
- <item android:drawable="@drawable/corpus_indicator_app_normal" />
+ <item android:state_enabled="true"
+ android:drawable="@drawable/corpus_indicator_arrow" />
</selector>
diff --git a/res/drawable/corpus_indicator_bg_focused_arrow.xml b/res/drawable/corpus_indicator_bg_focused_arrow.xml
new file mode 100644
index 0000000..28ed7e1
--- /dev/null
+++ b/res/drawable/corpus_indicator_bg_focused_arrow.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 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.
+ 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.
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:drawable="@drawable/corpus_indicator_bg_focused" />
+
+ <item android:drawable="@drawable/corpus_indicator_arrow" />
+
+</layer-list>
diff --git a/res/drawable/corpus_indicator_bg_noarrow.xml b/res/drawable/corpus_indicator_bg_noarrow.xml
new file mode 100644
index 0000000..279b7f6
--- /dev/null
+++ b/res/drawable/corpus_indicator_bg_noarrow.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 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.
+ 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">
+
+ <!-- We use a blank 9-patch here to work around a bug in the android framework. A subtle problem
+ in LayerDrawable means that if it is composed of simple drawable objects, it will reset the
+ padding of it's host view when set as the background. Using a 9-patch means that we can 'hard-
+ code' the padding we want into the 9 patch, so when it resets its host views padding it doesn't
+ actually change it. (drawable/corpus_indicator_bg uses layer drawables to composite an arrow
+ on top of these basic background). See bug 2826716. -->
+ <item android:state_window_focused="false" android:state_enabled="true"
+ android:drawable="@drawable/corpus_indicator_blank" />
+
+ <item android:state_pressed="true"
+ android:drawable="@drawable/corpus_indicator_bg_pressed" />
+
+ <item android:state_focused="true"
+ android:drawable="@drawable/corpus_indicator_bg_focused" />
+
+ <item android:state_enabled="true"
+ android:drawable="@drawable/corpus_indicator_blank" />
+
+</selector>
diff --git a/res/drawable/corpus_indicator_bg_pressed_arrow.xml b/res/drawable/corpus_indicator_bg_pressed_arrow.xml
new file mode 100644
index 0000000..434aa5e
--- /dev/null
+++ b/res/drawable/corpus_indicator_bg_pressed_arrow.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 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.
+ 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.
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:drawable="@drawable/corpus_indicator_bg_pressed" />
+
+ <item android:drawable="@drawable/corpus_indicator_arrow" />
+
+</layer-list>
+
diff --git a/res/drawable/corpus_indicator_widget_downarrow_bg.xml b/res/drawable/corpus_indicator_widget_downarrow_bg.xml
deleted file mode 100644
index 883f8bb..0000000
--- a/res/drawable/corpus_indicator_widget_downarrow_bg.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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.
- 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_window_focused="false" android:state_enabled="true"
- android:drawable="@drawable/corpus_indicator_downarrow_normal" />
-
- <item android:state_pressed="true"
- android:drawable="@drawable/corpus_indicator_downarrow_pressed" />
-
- <item android:state_enabled="true" android:state_focused="true"
- android:drawable="@drawable/corpus_indicator_downarrow_selected" />
-
- <item android:drawable="@drawable/corpus_indicator_downarrow_normal" />
-
-</selector>
diff --git a/res/drawable/corpus_indicator_widget_rightarrow_bg.xml b/res/drawable/corpus_indicator_widget_rightarrow_bg.xml
deleted file mode 100644
index 04382f7..0000000
--- a/res/drawable/corpus_indicator_widget_rightarrow_bg.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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.
- 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_window_focused="false" android:state_enabled="true"
- android:drawable="@drawable/corpus_indicator_rightarrow_normal" />
-
- <item android:state_pressed="true"
- android:drawable="@drawable/corpus_indicator_rightarrow_pressed" />
-
- <item android:state_enabled="true" android:state_focused="true"
- android:drawable="@drawable/corpus_indicator_rightarrow_selected" />
-
- <item android:drawable="@drawable/corpus_indicator_rightarrow_normal" />
-
-</selector>
diff --git a/res/drawable/voice_search_button_app_bg.xml b/res/drawable/voice_search_button_app_bg.xml
deleted file mode 100644
index 9763e9a..0000000
--- a/res/drawable/voice_search_button_app_bg.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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.
- 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_window_focused="false" android:state_enabled="true"
- android:drawable="@drawable/voice_search_button_app_normal" />
-
- <item android:state_pressed="true"
- android:drawable="@drawable/voice_search_button_app_pressed" />
-
- <item android:state_enabled="true" android:state_focused="true"
- android:drawable="@drawable/voice_search_button_app_selected" />
-
- <item android:drawable="@drawable/voice_search_button_app_normal" />
-
-</selector>
diff --git a/res/drawable/voice_search_button_widget_borderless_bg.xml b/res/drawable/voice_search_button_widget_borderless_bg.xml
deleted file mode 100644
index c54d936..0000000
--- a/res/drawable/voice_search_button_widget_borderless_bg.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 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.
- 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_window_focused="false" android:state_enabled="true"
- android:drawable="@drawable/voice_search_button_widget_borderless_normal" />
-
- <item android:state_pressed="true"
- android:drawable="@drawable/voice_search_button_widget_borderless_pressed" />
-
- <item android:state_enabled="true" android:state_focused="true"
- android:drawable="@drawable/voice_search_button_widget_borderless_selected" />
-
- <item android:drawable="@drawable/voice_search_button_widget_borderless_normal" />
-
-</selector>
diff --git a/res/layout/corpus_indicator.xml b/res/layout/corpus_indicator.xml
new file mode 100644
index 0000000..4be7b76
--- /dev/null
+++ b/res/layout/corpus_indicator.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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.
+-->
+
+<ImageButton
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/corpus_indicator"
+ android:layout_width="48dip"
+ android:layout_height="match_parent"
+ android:layout_marginTop="3dip"
+ android:paddingTop="2dip"
+ android:paddingBottom="11dip"
+ android:paddingLeft="6dip"
+ android:paddingRight="6dip"
+ android:scaleType="centerInside"
+ android:focusable="true"
+ android:clickable="true"
+ android:src="@drawable/search_app_icon"
+ android:background="@drawable/corpus_indicator_bg"
+ />
diff --git a/res/layout/search_activity.xml b/res/layout/search_activity.xml
index c366420..aefb38c 100644
--- a/res/layout/search_activity.xml
+++ b/res/layout/search_activity.xml
@@ -45,44 +45,46 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="-10dip"
+ android:paddingRight="4dip"
android:orientation="horizontal"
- android:gravity="center_vertical"
android:background="@drawable/search_plate_global"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
>
- <ImageButton
- android:id="@+id/corpus_indicator"
- android:layout_width="48dip"
- android:layout_height="match_parent"
- android:scaleType="centerInside"
- android:focusable="true"
- android:clickable="true"
- android:src="@drawable/search_app_icon"
- android:background="@drawable/corpus_indicator_app_bg"
- />
+ <include layout="@layout/corpus_indicator" />
- <com.android.quicksearchbox.ui.QueryTextView
- android:id="@+id/search_src_text"
+ <RelativeLayout
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1.0"
- android:layout_marginLeft="4dip"
android:layout_marginTop="6dip"
- android:layout_marginBottom="6dip"
- android:gravity="center_vertical|left"
- android:singleLine="true"
- android:ellipsize="end"
- android:inputType="text|textAutoComplete"
- android:background="@drawable/textfield_search_empty_google"
- android:textSize="18sp"
- android:textStyle="normal"
- android:textColor="@android:color/primary_text_light"
- android:textColorHint="@color/search_hint"
- android:imeOptions="actionGo"
- />
+ android:layout_marginBottom="6dip" >
+
+ <com.android.quicksearchbox.ui.QueryTextView
+ android:id="@+id/search_src_text"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingLeft="10dip"
+ android:paddingRight="10dip"
+ android:paddingTop="5dip"
+ android:paddingBottom="5dip"
+ android:gravity="center_vertical|left"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:inputType="text|textAutoComplete"
+ android:background="@drawable/textfield_search_empty_google"
+ android:textSize="18sp"
+ android:textStyle="normal"
+ android:textColor="@android:color/primary_text_light"
+ android:textColorHint="@color/search_hint"
+ android:imeOptions="actionGo"
+ />
+
+ <include layout="@layout/search_text_overlay"/>
+
+ </RelativeLayout>
<ImageButton
android:id="@+id/search_go_btn"
@@ -92,16 +94,16 @@
android:layout_height="match_parent"
android:layout_marginTop="6dip"
android:layout_marginBottom="6dip"
- android:layout_marginRight="4dip"
android:visibility="gone"
/>
<ImageButton
android:id="@+id/search_voice_btn"
- android:layout_width="56dip"
+ android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:background="@drawable/voice_search_button_app_bg"
- android:src="@drawable/voice_search_icon"
+ android:background="@drawable/btn_search_dialog_voice"
+ android:src="@drawable/ic_btn_speak_now"
+ android:layout_marginRight="-4dip"
/>
</LinearLayout>
diff --git a/res/layout/search_text_overlay.xml b/res/layout/search_text_overlay.xml
new file mode 100644
index 0000000..62d72e7
--- /dev/null
+++ b/res/layout/search_text_overlay.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 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.
+ 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.
+-->
+
+<merge />
\ No newline at end of file
diff --git a/res/layout/search_widget.xml b/res/layout/search_widget.xml
index 319c0b0..ba237bd 100644
--- a/res/layout/search_widget.xml
+++ b/res/layout/search_widget.xml
@@ -26,30 +26,23 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_alignParentLeft="true"
+ android:paddingRight="14dip"
android:orientation="horizontal"
- android:gravity="center_vertical"
android:background="@drawable/search_floater" >
- <ImageButton
- android:id="@+id/corpus_indicator"
- android:layout_width="48dip"
- android:layout_height="match_parent"
- android:scaleType="centerInside"
- android:focusable="true"
- android:clickable="true"
- android:paddingLeft="15dip"
- android:src="@drawable/search_app_icon"
- android:background="@drawable/corpus_indicator_widget_downarrow_bg"
- />
+ <include layout="@layout/corpus_indicator" />
<TextView
android:id="@+id/search_widget_text"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1.0"
- android:layout_marginLeft="4dip"
android:layout_marginTop="6dip"
android:layout_marginBottom="6dip"
+ android:paddingLeft="10dip"
+ android:paddingRight="10dip"
+ android:paddingTop="5dip"
+ android:paddingBottom="5dip"
android:gravity="center_vertical|left"
android:singleLine="true"
android:ellipsize="end"
@@ -71,16 +64,16 @@
android:layout_weight="1.0"
android:layout_marginTop="6dip"
android:layout_marginBottom="6dip"
- android:layout_marginLeft="6dip"
android:focusable="true"
/>
<ImageButton
android:id="@+id/search_widget_voice_btn"
- android:layout_width="56dip"
+ android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:background="@drawable/voice_search_button_widget_bg"
- android:src="@drawable/voice_search_icon"
+ android:background="@drawable/btn_search_dialog_voice"
+ android:src="@drawable/ic_btn_speak_now"
+ android:layout_marginRight="-4dip"
/>
</LinearLayout>
diff --git a/src/com/android/quicksearchbox/SearchWidgetProvider.java b/src/com/android/quicksearchbox/SearchWidgetProvider.java
index bb48761..a1f9e94 100644
--- a/src/com/android/quicksearchbox/SearchWidgetProvider.java
+++ b/src/com/android/quicksearchbox/SearchWidgetProvider.java
@@ -597,19 +597,20 @@
if (DBG) Log.d(TAG, "Updating appwidget " + mAppWidgetId);
RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.search_widget);
// Corpus indicator
- if (DBG) Log.d(TAG, "Corpus indicator intent: " + mCorpusIndicatorIntent.toUri(0));
+ // Before Froyo, android.resource URI could not be used in ImageViews.
+ if (QsbApplication.isFroyoOrLater()) {
+ views.setImageViewUri(R.id.corpus_indicator, mCorpusIconUri);
+ }
setOnClickActivityIntent(context, views, R.id.corpus_indicator,
mCorpusIndicatorIntent);
// Query TextView
views.setCharSequence(R.id.search_widget_text, "setHint", mQueryTextViewHint);
setBackgroundResource(views, R.id.search_widget_text, mQueryTextViewBackgroundResource);
- if (DBG) Log.d(TAG, "Query text view intent: " + mQueryTextViewIntent.toUri(0));
setOnClickActivityIntent(context, views, R.id.search_widget_text,
mQueryTextViewIntent);
// Voice Search button
if (mVoiceSearchIntent != null) {
- if (DBG) Log.d(TAG, "Voice search intent: " + mVoiceSearchIntent.toUri(0));
setOnClickActivityIntent(context, views, R.id.search_widget_voice_btn,
mVoiceSearchIntent);
views.setViewVisibility(R.id.search_widget_voice_btn, View.VISIBLE);
@@ -619,44 +620,22 @@
// Voice Search hints
if (mShowHint && !TextUtils.isEmpty(mVoiceSearchHint)) {
- // Corpus indicator
- views.setImageViewResource(R.id.corpus_indicator, R.drawable.hints_corpus_icon);
- setBackgroundResource(views, R.id.corpus_indicator,
- R.drawable.corpus_indicator_widget_rightarrow_bg);
-
- // Voice Search hints
views.setTextViewText(R.id.voice_search_hint_text, mVoiceSearchHint);
+
Intent voiceSearchHelp = getVoiceSearchHelpIntent(context);
if (voiceSearchHelp == null) voiceSearchHelp = mVoiceSearchIntent;
- if (DBG) Log.d(TAG, "Voice search hint intent: " + voiceSearchHelp.toUri(0));
setOnClickActivityIntent(context, views, R.id.voice_search_hint,
voiceSearchHelp);
- views.setViewVisibility(R.id.voice_search_hint, View.VISIBLE);
- // Query text view
+ views.setViewVisibility(R.id.voice_search_hint, View.VISIBLE);
views.setViewVisibility(R.id.search_widget_text, View.GONE);
- // Voice Search button
- setBackgroundResource(views, R.id.search_widget_voice_btn,
- R.drawable.voice_search_button_widget_borderless_bg);
- } else {
- // Corpus indicator
- // Before Froyo, android.resource URI could not be used in ImageViews.
- if (QsbApplication.isFroyoOrLater()) {
- views.setImageViewUri(R.id.corpus_indicator, mCorpusIconUri);
- }
setBackgroundResource(views, R.id.corpus_indicator,
- R.drawable.corpus_indicator_widget_downarrow_bg);
-
- // Voice Search hints
+ R.drawable.corpus_indicator_bg_noarrow);
+ } else {
views.setViewVisibility(R.id.voice_search_hint, View.GONE);
-
- // Query text view
views.setViewVisibility(R.id.search_widget_text, View.VISIBLE);
-
- // Voice Search button
- setBackgroundResource(views, R.id.search_widget_voice_btn,
- R.drawable.voice_search_button_widget_bg);
+ setBackgroundResource(views, R.id.corpus_indicator, R.drawable.corpus_indicator_bg);
}
appWidgetMgr.updateAppWidget(mAppWidgetId, views);
}
