Revert "Integrated new assets from alcor."
I screwed up and didn't see that this change had been merged, and edned up
amending it in highly non-trivial ways. I will submit another change
with includes this stuff plus a bunch more asset tweaks.
This reverts commit ad4007453d3dde6aeed9cc0aa65a300f11da51b8.
diff --git a/res/drawable-hdpi/all_corpus_icon.png b/res/drawable-hdpi/all_corpus_icon.png
deleted file mode 100644
index b572ad7..0000000
--- a/res/drawable-hdpi/all_corpus_icon.png
+++ /dev/null
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
index e67182e..354fe71 100644
--- a/res/drawable-hdpi/btn_search_dialog_voice_pressed.9.png
+++ 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
index 30bdb40..386d121 100644
--- a/res/drawable-hdpi/btn_search_dialog_voice_selected.9.png
+++ b/res/drawable-hdpi/btn_search_dialog_voice_selected.9.png
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.9.png b/res/drawable-hdpi/corpus_indicator_bg_focused.9.png
deleted file mode 100644
index de191e2..0000000
--- a/res/drawable-hdpi/corpus_indicator_bg_focused.9.png
+++ /dev/null
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_normal.9.png b/res/drawable-hdpi/corpus_indicator_bg_normal.9.png
deleted file mode 100644
index 5c874a1..0000000
--- a/res/drawable-hdpi/corpus_indicator_bg_normal.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/corpus_indicator_bg_pressed.9.png b/res/drawable-hdpi/corpus_indicator_bg_pressed.9.png
deleted file mode 100644
index d156cec..0000000
--- a/res/drawable-hdpi/corpus_indicator_bg_pressed.9.png
+++ /dev/null
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/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/voice_search_hint_bg_normal.9.png b/res/drawable-hdpi/voice_search_hint_bg_normal.9.png
index 9af92ba..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 f74968f..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 9c82490..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 4425cb1..0000000
--- a/res/drawable-hdpi/voice_search_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/all_corpus_icon.png b/res/drawable-mdpi/all_corpus_icon.png
deleted file mode 100644
index 87a1b53..0000000
--- a/res/drawable-mdpi/all_corpus_icon.png
+++ /dev/null
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
index ee58a00..f4ca7f1 100644
--- a/res/drawable-mdpi/btn_search_dialog_voice_pressed.9.png
+++ 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
index 64e667e..d263fee 100644
--- a/res/drawable-mdpi/btn_search_dialog_voice_selected.9.png
+++ 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.9.png b/res/drawable-mdpi/corpus_indicator_bg_focused.9.png
deleted file mode 100644
index 14d8b44..0000000
--- a/res/drawable-mdpi/corpus_indicator_bg_focused.9.png
+++ /dev/null
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_normal.9.png b/res/drawable-mdpi/corpus_indicator_bg_normal.9.png
deleted file mode 100644
index 1da8fc2..0000000
--- a/res/drawable-mdpi/corpus_indicator_bg_normal.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/corpus_indicator_bg_pressed.9.png b/res/drawable-mdpi/corpus_indicator_bg_pressed.9.png
deleted file mode 100644
index 29b490b..0000000
--- a/res/drawable-mdpi/corpus_indicator_bg_pressed.9.png
+++ /dev/null
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/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/voice_search_hint_bg_normal.9.png b/res/drawable-mdpi/voice_search_hint_bg_normal.9.png
index 9c9a240..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 96b3e83..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 41069e9..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 22015d5..0000000
--- a/res/drawable-mdpi/voice_search_icon.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/btn_search_dialog_voice.xml b/res/drawable/btn_search_dialog_voice.xml
index 5a5dfeb..748aaf5 100644
--- a/res/drawable/btn_search_dialog_voice.xml
+++ b/res/drawable/btn_search_dialog_voice.xml
@@ -15,11 +15,19 @@
-->
<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_bg.xml b/res/drawable/corpus_indicator_bg.xml
index 56cba2b..995d2d2 100644
--- a/res/drawable/corpus_indicator_bg.xml
+++ b/res/drawable/corpus_indicator_bg.xml
@@ -17,15 +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_bg_normal" />
+ android:drawable="@drawable/corpus_indicator_arrow" />
<item android:state_pressed="true"
- android:drawable="@drawable/corpus_indicator_bg_pressed" />
+ android:drawable="@drawable/corpus_indicator_bg_pressed_arrow" />
<item android:state_focused="true"
- android:drawable="@drawable/corpus_indicator_bg_focused" />
+ android:drawable="@drawable/corpus_indicator_bg_focused_arrow" />
<item android:state_enabled="true"
- android:drawable="@drawable/corpus_indicator_bg_normal" />
+ 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/layout/corpus_indicator.xml b/res/layout/corpus_indicator.xml
index 1de4702..4be7b76 100644
--- a/res/layout/corpus_indicator.xml
+++ b/res/layout/corpus_indicator.xml
@@ -19,9 +19,14 @@
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/all_corpus_icon"
+ 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 37bf966..aefb38c 100644
--- a/res/layout/search_activity.xml
+++ b/res/layout/search_activity.xml
@@ -47,7 +47,6 @@
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"
@@ -101,11 +100,10 @@
<ImageButton
android:id="@+id/search_voice_btn"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
android:background="@drawable/btn_search_dialog_voice"
- android:src="@drawable/voice_search_icon"
+ android:src="@drawable/ic_btn_speak_now"
android:layout_marginRight="-4dip"
- android:layout_marginLeft="-4dip"
/>
</LinearLayout>
diff --git a/res/layout/search_widget.xml b/res/layout/search_widget.xml
index 14e5b3e..ba237bd 100644
--- a/res/layout/search_widget.xml
+++ b/res/layout/search_widget.xml
@@ -28,7 +28,6 @@
android:layout_alignParentLeft="true"
android:paddingRight="14dip"
android:orientation="horizontal"
- android:gravity="center_vertical"
android:background="@drawable/search_floater" >
<include layout="@layout/corpus_indicator" />
@@ -71,11 +70,10 @@
<ImageButton
android:id="@+id/search_widget_voice_btn"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
android:background="@drawable/btn_search_dialog_voice"
- android:src="@drawable/voice_search_icon"
+ android:src="@drawable/ic_btn_speak_now"
android:layout_marginRight="-4dip"
- android:layout_marginLeft="-4dip"
/>
</LinearLayout>
diff --git a/src/com/android/quicksearchbox/SearchWidgetProvider.java b/src/com/android/quicksearchbox/SearchWidgetProvider.java
index 9d25f50..a1f9e94 100644
--- a/src/com/android/quicksearchbox/SearchWidgetProvider.java
+++ b/src/com/android/quicksearchbox/SearchWidgetProvider.java
@@ -631,7 +631,7 @@
views.setViewVisibility(R.id.search_widget_text, View.GONE);
setBackgroundResource(views, R.id.corpus_indicator,
- R.drawable.btn_search_dialog_voice);
+ R.drawable.corpus_indicator_bg_noarrow);
} else {
views.setViewVisibility(R.id.voice_search_hint, View.GONE);
views.setViewVisibility(R.id.search_widget_text, View.VISIBLE);
diff --git a/src/com/android/quicksearchbox/ui/CorpusViewInflater.java b/src/com/android/quicksearchbox/ui/CorpusViewInflater.java
index a212b2b..4592e67 100644
--- a/src/com/android/quicksearchbox/ui/CorpusViewInflater.java
+++ b/src/com/android/quicksearchbox/ui/CorpusViewInflater.java
@@ -57,7 +57,7 @@
}
private int getGlobalSearchIconResource() {
- return R.drawable.all_corpus_icon;
+ return R.drawable.search_app_icon;
}
public Drawable getGlobalSearchIcon() {
