summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/res/res/drawable-hdpi/ic_clear.pngbin0 -> 1945 bytes
-rw-r--r--core/res/res/drawable-hdpi/ic_clear_off.pngbin0 -> 1774 bytes
-rw-r--r--core/res/res/drawable-hdpi/ic_commit.pngbin0 -> 1438 bytes
-rw-r--r--core/res/res/drawable-hdpi/ic_go.pngbin0 -> 1415 bytes
-rw-r--r--core/res/res/drawable-hdpi/ic_search.pngbin0 -> 2558 bytes
-rw-r--r--core/res/res/drawable-hdpi/ic_voice_search.pngbin0 -> 2070 bytes
-rw-r--r--core/res/res/drawable-mdpi/ic_clear.pngbin0 -> 1869 bytes
-rw-r--r--core/res/res/drawable-mdpi/ic_clear_off.pngbin0 -> 1623 bytes
-rw-r--r--core/res/res/drawable-mdpi/ic_commit.pngbin0 -> 1468 bytes
-rw-r--r--core/res/res/drawable-mdpi/ic_go.pngbin0 -> 1436 bytes
-rw-r--r--core/res/res/drawable-mdpi/ic_search.pngbin0 -> 2445 bytes
-rw-r--r--core/res/res/drawable-mdpi/ic_voice_search.pngbin0 -> 1980 bytes
-rw-r--r--core/res/res/layout/search_view.xml59
-rwxr-xr-xcore/res/res/values/attrs.xml12
-rw-r--r--core/res/res/values/styles.xml36
-rw-r--r--core/res/res/values/themes.xml8
16 files changed, 71 insertions, 44 deletions
diff --git a/core/res/res/drawable-hdpi/ic_clear.png b/core/res/res/drawable-hdpi/ic_clear.png
new file mode 100644
index 000000000000..33ad8d4b891b
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_clear.png
Binary files differ
diff --git a/core/res/res/drawable-hdpi/ic_clear_off.png b/core/res/res/drawable-hdpi/ic_clear_off.png
new file mode 100644
index 000000000000..d97c342d5369
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_clear_off.png
Binary files differ
diff --git a/core/res/res/drawable-hdpi/ic_commit.png b/core/res/res/drawable-hdpi/ic_commit.png
new file mode 100644
index 000000000000..404051c55688
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_commit.png
Binary files differ
diff --git a/core/res/res/drawable-hdpi/ic_go.png b/core/res/res/drawable-hdpi/ic_go.png
new file mode 100644
index 000000000000..97b825e83173
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_go.png
Binary files differ
diff --git a/core/res/res/drawable-hdpi/ic_search.png b/core/res/res/drawable-hdpi/ic_search.png
new file mode 100644
index 000000000000..bf8bd6670ae4
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_search.png
Binary files differ
diff --git a/core/res/res/drawable-hdpi/ic_voice_search.png b/core/res/res/drawable-hdpi/ic_voice_search.png
new file mode 100644
index 000000000000..66d14aec0cce
--- /dev/null
+++ b/core/res/res/drawable-hdpi/ic_voice_search.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/ic_clear.png b/core/res/res/drawable-mdpi/ic_clear.png
new file mode 100644
index 000000000000..86944a879b98
--- /dev/null
+++ b/core/res/res/drawable-mdpi/ic_clear.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/ic_clear_off.png b/core/res/res/drawable-mdpi/ic_clear_off.png
new file mode 100644
index 000000000000..b9c3b4450568
--- /dev/null
+++ b/core/res/res/drawable-mdpi/ic_clear_off.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/ic_commit.png b/core/res/res/drawable-mdpi/ic_commit.png
new file mode 100644
index 000000000000..49d7ec87ea91
--- /dev/null
+++ b/core/res/res/drawable-mdpi/ic_commit.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/ic_go.png b/core/res/res/drawable-mdpi/ic_go.png
new file mode 100644
index 000000000000..234064838de1
--- /dev/null
+++ b/core/res/res/drawable-mdpi/ic_go.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/ic_search.png b/core/res/res/drawable-mdpi/ic_search.png
new file mode 100644
index 000000000000..d92071b995b9
--- /dev/null
+++ b/core/res/res/drawable-mdpi/ic_search.png
Binary files differ
diff --git a/core/res/res/drawable-mdpi/ic_voice_search.png b/core/res/res/drawable-mdpi/ic_voice_search.png
new file mode 100644
index 000000000000..a2fe87452859
--- /dev/null
+++ b/core/res/res/drawable-mdpi/ic_voice_search.png
Binary files differ
diff --git a/core/res/res/layout/search_view.xml b/core/res/res/layout/search_view.xml
index 0fd9a7733bf4..eb0bb118c7ed 100644
--- a/core/res/res/layout/search_view.xml
+++ b/core/res/res/layout/search_view.xml
@@ -43,7 +43,8 @@
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
- android:src="@android:drawable/ic_btn_search"
+ android:background="?android:attr/selectableItemBackground"
+ android:src="@android:drawable/ic_search"
/>
<LinearLayout
@@ -56,6 +57,7 @@
<!-- Inner layout contains the app icon, button(s) and EditText -->
<LinearLayout
+ android:id="@+id/search_plate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
@@ -65,16 +67,16 @@
<ImageView
android:id="@+id/search_app_icon"
- android:layout_height="24dip"
- android:layout_width="24dip"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
android:layout_marginRight="7dip"
- android:layout_gravity="bottom"
- android:src="@android:drawable/ic_btn_search"
+ android:layout_gravity="center_vertical"
+ android:src="?android:attr/searchViewSearchIcon"
/>
<AutoCompleteTextView
android:id="@+id/search_src_text"
- android:layout_height="wrap_content"
+ android:layout_height="36dip"
android:layout_width="0dp"
android:layout_weight="1"
android:minWidth="100dp"
@@ -88,43 +90,46 @@
android:inputType="text|textAutoComplete"
android:imeOptions="actionSearch"
android:dropDownHeight="wrap_content"
- android:dropDownAnchor="@id/search_edit_frame"
+ android:dropDownAnchor="@id/search_plate"
android:dropDownVerticalOffset="0dip"
android:dropDownHorizontalOffset="0dip"
- android:popupBackground="?android:attr/searchDropdownBackground"
/>
- <!-- TODO: Use the generic dialog close drawable -->
<ImageView
android:id="@+id/search_close_btn"
- android:layout_width="24dp"
- android:layout_height="24dp"
- android:layout_gravity="bottom"
- android:src="@android:drawable/btn_close"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:paddingLeft="4dip"
+ android:paddingRight="4dip"
+ android:layout_gravity="center_vertical"
+ android:background="?android:attr/selectableItemBackground"
+ android:src="?android:attr/searchViewCloseIcon"
/>
</LinearLayout>
- <ImageView
- android:id="@+id/search_go_btn"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom"
- android:layout_marginLeft="4dip"
- android:layout_marginRight="4dip"
- android:src="@android:drawable/ic_btn_find_next"
- />
</LinearLayout>
- <ImageButton
+ <ImageView
+ android:id="@+id/search_go_btn"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_gravity="center_vertical"
+ android:paddingLeft="4dip"
+ android:paddingRight="4dip"
+ android:background="?android:attr/selectableItemBackground"
+ android:src="?android:attr/searchViewGoIcon"
+ />
+
+ <ImageView
android:id="@+id/search_voice_btn"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
- android:layout_marginLeft="4dip"
- android:layout_marginRight="4dip"
- android:src="@android:drawable/ic_btn_speak_now"
- android:background="@android:color/transparent"
+ android:paddingLeft="4dip"
+ android:paddingRight="4dip"
+ android:src="?android:attr/searchViewVoiceIcon"
+ android:background="?android:attr/selectableItemBackground"
android:visibility="gone"
/>
</LinearLayout>
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index 3f81a895b932..eacd14e00665 100755
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -605,8 +605,20 @@
<!-- Background drawable for standalone items that need focus/pressed states. -->
<attr name="selectableItemBackground" format="reference" />
+ <!-- ============================ -->
+ <!-- SearchView styles and assets -->
+ <!-- ============================ -->
+ <eat-comment />
<!-- SearchView dropdown background -->
<attr name="searchDropdownBackground" format="reference" />
+ <!-- SearchView close button icon -->
+ <attr name="searchViewCloseIcon" format="reference" />
+ <!-- SearchView Go button icon -->
+ <attr name="searchViewGoIcon" format="reference" />
+ <!-- SearchView Search icon -->
+ <attr name="searchViewSearchIcon" format="reference" />
+ <!-- SearchView Voice button icon -->
+ <attr name="searchViewVoiceIcon" 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/styles.xml b/core/res/res/values/styles.xml
index 6985de6a57d8..2754e739f808 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -779,23 +779,22 @@
<item name="android:textColor">@android:color/sliding_tab_text_color_active</item>
<item name="android:textSize">28sp</item>
</style>
-
- <!-- @hide -->
+ <!-- @hide -->
<style name="TextAppearance.SearchResult">
<item name="android:textStyle">normal</item>
<item name="android:textColor">?textColorPrimaryInverse</item>
<item name="android:textColorHint">?textColorHintInverse</item>
</style>
-
- <!-- @hide -->
+
+ <!-- @hide -->
<style name="TextAppearance.SearchResult.Title">
- <item name="android:textSize">16sp</item>
+ <item name="android:textSize">18sp</item>
</style>
-
- <!-- @hide -->
+
+ <!-- @hide -->
<style name="TextAppearance.SearchResult.Subtitle">
- <item name="android:textSize">13sp</item>
+ <item name="android:textSize">14sp</item>
<item name="android:textColor">?textColorSecondaryInverse</item>
</style>
@@ -1061,17 +1060,17 @@
<style name="TextAppearance.Holo.SearchResult">
<item name="android:textStyle">normal</item>
- <item name="android:textColor">?textColorPrimaryInverse</item>
- <item name="android:textColorHint">?textColorHintInverse</item>
+ <item name="android:textColor">?textColorPrimary</item>
+ <item name="android:textColorHint">?textColorHint</item>
</style>
<style name="TextAppearance.Holo.SearchResult.Title">
- <item name="android:textSize">16sp</item>
+ <item name="android:textSize">18sp</item>
</style>
<style name="TextAppearance.Holo.SearchResult.Subtitle">
- <item name="android:textSize">13sp</item>
- <item name="android:textColor">?textColorSecondaryInverse</item>
+ <item name="android:textSize">14sp</item>
+ <item name="android:textColor">?textColorSecondary</item>
</style>
<style name="TextAppearance.Holo.Widget" parent="TextAppearance.Widget">
@@ -1203,14 +1202,17 @@
</style>
<style name="TextAppearance.Holo.Light.SearchResult" parent="TextAppearance.Holo.SearchResult">
- <item name="android:textColor">?textColorPrimary</item>
- <item name="android:textColorHint">?textColorHint</item>
+ <item name="android:textColor">?textColorPrimary</item>
+ <item name="android:textColorHint">?textColorHint</item>
</style>
<style name="TextAppearance.Holo.Light.SearchResult.Title">
+ <item name="android:textSize">18sp</item>
</style>
<style name="TextAppearance.Holo.Light.SearchResult.Subtitle">
+ <item name="android:textSize">14sp</item>
+ <item name="android:textColor">?textColorSecondary</item>
</style>
<style name="TextAppearance.Holo.Light.Widget" parent="TextAppearance.Widget">
@@ -1320,6 +1322,8 @@
</style>
<style name="Widget.Holo.AutoCompleteTextView" parent="Widget.AutoCompleteTextView">
+ <item name="android:dropDownSelector">@android:drawable/list_selector_holo_dark</item>
+ <item name="android:popupBackground">@android:drawable/menu_dropdown_panel_holo_dark</item>
</style>
<style name="Widget.Holo.CompoundButton.CheckBox" parent="Widget.CompoundButton.CheckBox">
@@ -1620,6 +1624,8 @@
</style>
<style name="Widget.Holo.Light.AutoCompleteTextView" parent="Widget.AutoCompleteTextView">
+ <item name="android:dropDownSelector">@android:drawable/list_selector_holo_light</item>
+ <item name="android:popupBackground">@android:drawable/menu_dropdown_panel_holo_light</item>
</style>
<style name="Widget.Holo.Light.CompoundButton.CheckBox" parent="Widget.CompoundButton.CheckBox">
diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml
index 1ef99d0b2139..0eec0df28e68 100644
--- a/core/res/res/values/themes.xml
+++ b/core/res/res/values/themes.xml
@@ -261,7 +261,11 @@
<item name="buttonGroupStyle">@android:style/Widget.ButtonGroup</item>
<!-- SearchView attributes -->
- <item name="searchDropdownBackground">@android:drawable/search_dropdown_dark</item>
+ <item name="searchDropdownBackground">@android:drawable/spinner_dropdown_background</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>
+ <item name="searchViewVoiceIcon">@android:drawable/ic_voice_search</item>
<!-- PreferenceFrameLayout attributes -->
<item name="preferenceFrameLayoutStyle">@android:style/Widget.PreferenceFrameLayout</item>
@@ -1028,7 +1032,7 @@
<!-- Widget styles -->
<item name="absListViewStyle">@android:style/Widget.Holo.AbsListView</item>
- <item name="autoCompleteTextViewStyle">@android:style/Widget.Holo.AutoCompleteTextView</item>
+ <item name="autoCompleteTextViewStyle">@android:style/Widget.Holo.Light.AutoCompleteTextView</item>
<item name="checkboxStyle">@android:style/Widget.Holo.CompoundButton.CheckBox</item>
<item name="dropDownListViewStyle">@android:style/Widget.Holo.ListView.DropDown</item>
<item name="editTextStyle">@android:style/Widget.Holo.EditText</item>
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2025-12-12 12:40:53 +0000