diff options
23 files changed, 130 insertions, 33 deletions
diff --git a/core/res/res/drawable-hdpi/textfield_search_default_holo_dark.9.png b/core/res/res/drawable-hdpi/textfield_search_default_holo_dark.9.png Binary files differindex 5b62564818b7..9646e63a5a0a 100644 --- a/core/res/res/drawable-hdpi/textfield_search_default_holo_dark.9.png +++ b/core/res/res/drawable-hdpi/textfield_search_default_holo_dark.9.png diff --git a/core/res/res/drawable-hdpi/textfield_search_default_holo_light.9.png b/core/res/res/drawable-hdpi/textfield_search_default_holo_light.9.png Binary files differindex 881edeb6bc64..8c8e56a1b7ac 100644 --- a/core/res/res/drawable-hdpi/textfield_search_default_holo_light.9.png +++ b/core/res/res/drawable-hdpi/textfield_search_default_holo_light.9.png diff --git a/core/res/res/drawable-hdpi/textfield_search_right_default_holo_dark.9.png b/core/res/res/drawable-hdpi/textfield_search_right_default_holo_dark.9.png Binary files differnew file mode 100644 index 000000000000..b9407ba7c33b --- /dev/null +++ b/core/res/res/drawable-hdpi/textfield_search_right_default_holo_dark.9.png diff --git a/core/res/res/drawable-hdpi/textfield_search_right_default_holo_light.9.png b/core/res/res/drawable-hdpi/textfield_search_right_default_holo_light.9.png Binary files differnew file mode 100644 index 000000000000..00901244b10c --- /dev/null +++ b/core/res/res/drawable-hdpi/textfield_search_right_default_holo_light.9.png diff --git a/core/res/res/drawable-hdpi/textfield_search_right_selected_holo_dark.9.png b/core/res/res/drawable-hdpi/textfield_search_right_selected_holo_dark.9.png Binary files differnew file mode 100644 index 000000000000..16b75c628772 --- /dev/null +++ b/core/res/res/drawable-hdpi/textfield_search_right_selected_holo_dark.9.png diff --git a/core/res/res/drawable-hdpi/textfield_search_right_selected_holo_light.9.png b/core/res/res/drawable-hdpi/textfield_search_right_selected_holo_light.9.png Binary files differnew file mode 100644 index 000000000000..472c564bb174 --- /dev/null +++ b/core/res/res/drawable-hdpi/textfield_search_right_selected_holo_light.9.png diff --git a/core/res/res/drawable-hdpi/textfield_search_selected_holo_dark.9.png b/core/res/res/drawable-hdpi/textfield_search_selected_holo_dark.9.png Binary files differindex cb3f35b4e37b..d097577bd766 100644 --- a/core/res/res/drawable-hdpi/textfield_search_selected_holo_dark.9.png +++ b/core/res/res/drawable-hdpi/textfield_search_selected_holo_dark.9.png diff --git a/core/res/res/drawable-hdpi/textfield_search_selected_holo_light.9.png b/core/res/res/drawable-hdpi/textfield_search_selected_holo_light.9.png Binary files differindex 742b13760ce1..f36cad8c620b 100644 --- a/core/res/res/drawable-hdpi/textfield_search_selected_holo_light.9.png +++ b/core/res/res/drawable-hdpi/textfield_search_selected_holo_light.9.png diff --git a/core/res/res/drawable-mdpi/textfield_search_default_holo_dark.9.png b/core/res/res/drawable-mdpi/textfield_search_default_holo_dark.9.png Binary files differindex 354994883d1f..9646e63a5a0a 100644 --- a/core/res/res/drawable-mdpi/textfield_search_default_holo_dark.9.png +++ b/core/res/res/drawable-mdpi/textfield_search_default_holo_dark.9.png diff --git a/core/res/res/drawable-mdpi/textfield_search_default_holo_light.9.png b/core/res/res/drawable-mdpi/textfield_search_default_holo_light.9.png Binary files differindex 6db03cb8fdc1..8c8e56a1b7ac 100644 --- a/core/res/res/drawable-mdpi/textfield_search_default_holo_light.9.png +++ b/core/res/res/drawable-mdpi/textfield_search_default_holo_light.9.png diff --git a/core/res/res/drawable-mdpi/textfield_search_right_default_holo_dark.9.png b/core/res/res/drawable-mdpi/textfield_search_right_default_holo_dark.9.png Binary files differnew file mode 100644 index 000000000000..b9407ba7c33b --- /dev/null +++ b/core/res/res/drawable-mdpi/textfield_search_right_default_holo_dark.9.png diff --git a/core/res/res/drawable-mdpi/textfield_search_right_default_holo_light.9.png b/core/res/res/drawable-mdpi/textfield_search_right_default_holo_light.9.png Binary files differnew file mode 100644 index 000000000000..00901244b10c --- /dev/null +++ b/core/res/res/drawable-mdpi/textfield_search_right_default_holo_light.9.png diff --git a/core/res/res/drawable-mdpi/textfield_search_right_selected_holo_dark.9.png b/core/res/res/drawable-mdpi/textfield_search_right_selected_holo_dark.9.png Binary files differnew file mode 100644 index 000000000000..16b75c628772 --- /dev/null +++ b/core/res/res/drawable-mdpi/textfield_search_right_selected_holo_dark.9.png diff --git a/core/res/res/drawable-mdpi/textfield_search_right_selected_holo_light.9.png b/core/res/res/drawable-mdpi/textfield_search_right_selected_holo_light.9.png Binary files differnew file mode 100644 index 000000000000..472c564bb174 --- /dev/null +++ b/core/res/res/drawable-mdpi/textfield_search_right_selected_holo_light.9.png diff --git a/core/res/res/drawable-mdpi/textfield_search_selected_holo_dark.9.png b/core/res/res/drawable-mdpi/textfield_search_selected_holo_dark.9.png Binary files differindex 670439a2dcd9..d097577bd766 100644 --- a/core/res/res/drawable-mdpi/textfield_search_selected_holo_dark.9.png +++ b/core/res/res/drawable-mdpi/textfield_search_selected_holo_dark.9.png diff --git a/core/res/res/drawable-mdpi/textfield_search_selected_holo_light.9.png b/core/res/res/drawable-mdpi/textfield_search_selected_holo_light.9.png Binary files differindex 90e26e290dec..f36cad8c620b 100644 --- a/core/res/res/drawable-mdpi/textfield_search_selected_holo_light.9.png +++ b/core/res/res/drawable-mdpi/textfield_search_selected_holo_light.9.png diff --git a/core/res/res/drawable/textfield_searchview_holo_dark.xml b/core/res/res/drawable/textfield_searchview_holo_dark.xml new file mode 100644 index 000000000000..1396f83356f0 --- /dev/null +++ b/core/res/res/drawable/textfield_searchview_holo_dark.xml @@ -0,0 +1,22 @@ +<?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_focused="true" + android:drawable="@drawable/textfield_search_selected_holo_dark" /> + <item android:drawable="@drawable/textfield_search_default_holo_dark" /> +</selector> + diff --git a/core/res/res/drawable/textfield_searchview_holo_light.xml b/core/res/res/drawable/textfield_searchview_holo_light.xml new file mode 100644 index 000000000000..5198f9cb0c76 --- /dev/null +++ b/core/res/res/drawable/textfield_searchview_holo_light.xml @@ -0,0 +1,22 @@ +<?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_focused="true" + android:drawable="@drawable/textfield_search_selected_holo_light" /> + <item android:drawable="@drawable/textfield_search_default_holo_light" /> +</selector> + diff --git a/core/res/res/drawable/textfield_searchview_right_holo_dark.xml b/core/res/res/drawable/textfield_searchview_right_holo_dark.xml new file mode 100644 index 000000000000..b4f1ca1ce19f --- /dev/null +++ b/core/res/res/drawable/textfield_searchview_right_holo_dark.xml @@ -0,0 +1,22 @@ +<?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_focused="true" + android:drawable="@drawable/textfield_search_right_selected_holo_dark" /> + <item android:drawable="@drawable/textfield_search_right_default_holo_dark" /> +</selector> + diff --git a/core/res/res/drawable/textfield_searchview_right_holo_light.xml b/core/res/res/drawable/textfield_searchview_right_holo_light.xml new file mode 100644 index 000000000000..e521bf6e2745 --- /dev/null +++ b/core/res/res/drawable/textfield_searchview_right_holo_light.xml @@ -0,0 +1,22 @@ +<?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_focused="true" + android:drawable="@drawable/textfield_search_right_selected_holo_light" /> + <item android:drawable="@drawable/textfield_search_right_default_holo_light" /> +</selector> + diff --git a/core/res/res/layout/search_view.xml b/core/res/res/layout/search_view.xml index c41c2decd35b..93b6deb6e57e 100644 --- a/core/res/res/layout/search_view.xml +++ b/core/res/res/layout/search_view.xml @@ -64,7 +64,7 @@ android:layout_weight="1" android:layout_gravity="center_vertical" android:orientation="horizontal" - android:background="?android:attr/editTextBackground"> + android:background="?android:attr/searchViewTextField"> <ImageView android:id="@+id/search_app_icon" @@ -91,7 +91,7 @@ android:inputType="text|textAutoComplete" android:imeOptions="actionSearch" android:dropDownHeight="wrap_content" - android:dropDownAnchor="@id/search_plate" + android:dropDownAnchor="@id/search_edit_frame" android:dropDownVerticalOffset="0dip" android:dropDownHorizontalOffset="0dip" /> @@ -110,38 +110,39 @@ </LinearLayout> - </LinearLayout> - - <LinearLayout - android:id="@+id/submit_area" - android:orientation="horizontal" - android:layout_width="wrap_content" - android:layout_height="match_parent"> - - <ImageView - android:id="@+id/search_go_btn" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_gravity="center_vertical" - android:paddingLeft="16dip" - android:paddingRight="16dip" - android:background="?android:attr/selectableItemBackground" - android:src="?android:attr/searchViewGoIcon" - android:visibility="gone" - android:focusable="true" - /> - - <ImageView - android:id="@+id/search_voice_btn" + <LinearLayout + android:id="@+id/submit_area" + android:orientation="horizontal" android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_gravity="center_vertical" - android:paddingLeft="16dip" - android:paddingRight="16dip" - android:src="?android:attr/searchViewVoiceIcon" - android:background="?android:attr/selectableItemBackground" - android:visibility="gone" - android:focusable="true" - /> + android:background="?android:attr/searchViewTextFieldRight"> + + <ImageView + android:id="@+id/search_go_btn" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_gravity="center_vertical" + android:paddingLeft="16dip" + android:paddingRight="16dip" + android:background="?android:attr/selectableItemBackground" + android:src="?android:attr/searchViewGoIcon" + android:visibility="gone" + android:focusable="true" + /> + + <ImageView + android:id="@+id/search_voice_btn" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_gravity="center_vertical" + android:paddingLeft="16dip" + android:paddingRight="16dip" + android:src="?android:attr/searchViewVoiceIcon" + android:background="?android:attr/selectableItemBackground" + android:visibility="gone" + android:focusable="true" + /> + </LinearLayout> </LinearLayout> + </LinearLayout> diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index d3b1062416c3..5ca65485b7c0 100755 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -723,6 +723,10 @@ <attr name="searchViewEditQuery" format="reference" /> <!-- SearchView query refinement icon background --> <attr name="searchViewEditQueryBackground" format="reference" /> + <!-- SearchView text field background for the left section --> + <attr name="searchViewTextField" format="reference" /> + <!-- SearchView text field background for the right section --> + <attr name="searchViewTextFieldRight" format="reference" /> <!-- Specifies a drawable to use for the 'home as up' indicator. --> <attr name="homeAsUpIndicator" format="reference" /> diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml index 82164e5ae742..0bd42d5655a9 100644 --- a/core/res/res/values/themes.xml +++ b/core/res/res/values/themes.xml @@ -282,6 +282,8 @@ <!-- SearchView attributes --> <item name="searchDropdownBackground">@android:drawable/spinner_dropdown_background</item> + <item name="searchViewTextField">@drawable/textfield_searchview_holo_dark</item> + <item name="searchViewTextFieldRight">@drawable/textfield_searchview_right_holo_dark</item> <item name="searchViewCloseIcon">@android:drawable/ic_clear</item> <item name="searchViewSearchIcon">@android:drawable/ic_search</item> <item name="searchViewGoIcon">@android:drawable/ic_go</item> @@ -387,6 +389,8 @@ <!-- SearchView attributes --> <item name="searchDropdownBackground">@android:drawable/search_dropdown_light</item> + <item name="searchViewTextField">@drawable/textfield_searchview_holo_light</item> + <item name="searchViewTextFieldRight">@drawable/textfield_searchview_right_holo_light</item> <item name="searchViewCloseIcon">@android:drawable/ic_clear_holo_light</item> <item name="searchViewSearchIcon">@android:drawable/ic_search_api_holo_light</item> <item name="searchViewGoIcon">@android:drawable/ic_go_search_api_holo_light</item> |
