commit | 11579e559593b8c271247fe548f6446af7f6e1ca | [log] [tgz] |
---|---|---|
author | Adam Powell <adamp@google.com> | Wed Feb 05 02:28:13 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Feb 05 02:28:14 2014 +0000 |
tree | 1b75c38312a37a008ee1c55828ccb8cd174a0735 | |
parent | 278a5619256cd96763775cea6da7aadc894d962a [diff] | |
parent | 03d165b1da9f7c36a993c8211c76a88b56557cd0 [diff] |
Merge "Import updated SearchView assets from UX"
diff --git a/core/res/res/drawable-hdpi/ic_search_api_holo_dark.png b/core/res/res/drawable-hdpi/ic_search_api_holo_dark.png new file mode 100644 index 0000000..8d529b8 --- /dev/null +++ b/core/res/res/drawable-hdpi/ic_search_api_holo_dark.png Binary files differ
diff --git a/core/res/res/drawable-hdpi/ic_search_api_holo_light.png b/core/res/res/drawable-hdpi/ic_search_api_holo_light.png index 72e207b..8b15ecb 100644 --- a/core/res/res/drawable-hdpi/ic_search_api_holo_light.png +++ b/core/res/res/drawable-hdpi/ic_search_api_holo_light.png Binary files differ
diff --git a/core/res/res/drawable-hdpi/ic_voice_search_api_holo_dark.png b/core/res/res/drawable-hdpi/ic_voice_search_api_holo_dark.png new file mode 100644 index 0000000..32062a6 --- /dev/null +++ b/core/res/res/drawable-hdpi/ic_voice_search_api_holo_dark.png Binary files differ
diff --git a/core/res/res/drawable-hdpi/ic_voice_search_api_holo_light.png b/core/res/res/drawable-hdpi/ic_voice_search_api_holo_light.png index 3481c98..d2b2d21 100644 --- a/core/res/res/drawable-hdpi/ic_voice_search_api_holo_light.png +++ b/core/res/res/drawable-hdpi/ic_voice_search_api_holo_light.png Binary files differ
diff --git a/core/res/res/drawable-mdpi/ic_search.png b/core/res/res/drawable-mdpi/ic_search.png index 4be72f1..66145e0 100644 --- a/core/res/res/drawable-mdpi/ic_search.png +++ b/core/res/res/drawable-mdpi/ic_search.png Binary files differ
diff --git a/core/res/res/drawable-mdpi/ic_search_api_holo_dark.png b/core/res/res/drawable-mdpi/ic_search_api_holo_dark.png new file mode 100644 index 0000000..4771a56 --- /dev/null +++ b/core/res/res/drawable-mdpi/ic_search_api_holo_dark.png Binary files differ
diff --git a/core/res/res/drawable-mdpi/ic_search_api_holo_light.png b/core/res/res/drawable-mdpi/ic_search_api_holo_light.png index f2e26f8..60a55f8 100644 --- a/core/res/res/drawable-mdpi/ic_search_api_holo_light.png +++ b/core/res/res/drawable-mdpi/ic_search_api_holo_light.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 index 73c6be6..b2535fb 100644 --- a/core/res/res/drawable-mdpi/ic_voice_search.png +++ b/core/res/res/drawable-mdpi/ic_voice_search.png Binary files differ
diff --git a/core/res/res/drawable-mdpi/ic_voice_search_api_holo_dark.png b/core/res/res/drawable-mdpi/ic_voice_search_api_holo_dark.png new file mode 100644 index 0000000..fcc2105 --- /dev/null +++ b/core/res/res/drawable-mdpi/ic_voice_search_api_holo_dark.png Binary files differ
diff --git a/core/res/res/drawable-mdpi/ic_voice_search_api_holo_light.png b/core/res/res/drawable-mdpi/ic_voice_search_api_holo_light.png index 71d838e..b516b95 100644 --- a/core/res/res/drawable-mdpi/ic_voice_search_api_holo_light.png +++ b/core/res/res/drawable-mdpi/ic_voice_search_api_holo_light.png Binary files differ
diff --git a/core/res/res/drawable-xhdpi/ic_search.png b/core/res/res/drawable-xhdpi/ic_search.png index 998f91b..738a392 100644 --- a/core/res/res/drawable-xhdpi/ic_search.png +++ b/core/res/res/drawable-xhdpi/ic_search.png Binary files differ
diff --git a/core/res/res/drawable-xhdpi/ic_search_api_holo_dark.png b/core/res/res/drawable-xhdpi/ic_search_api_holo_dark.png new file mode 100644 index 0000000..b0d7acf --- /dev/null +++ b/core/res/res/drawable-xhdpi/ic_search_api_holo_dark.png Binary files differ
diff --git a/core/res/res/drawable-xhdpi/ic_search_api_holo_light.png b/core/res/res/drawable-xhdpi/ic_search_api_holo_light.png index a4cdf1c..c9626a0 100644 --- a/core/res/res/drawable-xhdpi/ic_search_api_holo_light.png +++ b/core/res/res/drawable-xhdpi/ic_search_api_holo_light.png Binary files differ
diff --git a/core/res/res/drawable-xhdpi/ic_search_category_default.png b/core/res/res/drawable-xhdpi/ic_search_category_default.png index 7d5170e..351cfe0 100644 --- a/core/res/res/drawable-xhdpi/ic_search_category_default.png +++ b/core/res/res/drawable-xhdpi/ic_search_category_default.png Binary files differ
diff --git a/core/res/res/drawable-xhdpi/ic_voice_search.png b/core/res/res/drawable-xhdpi/ic_voice_search.png index c625a36..3f0518b 100644 --- a/core/res/res/drawable-xhdpi/ic_voice_search.png +++ b/core/res/res/drawable-xhdpi/ic_voice_search.png Binary files differ
diff --git a/core/res/res/drawable-xhdpi/ic_voice_search_api_holo_dark.png b/core/res/res/drawable-xhdpi/ic_voice_search_api_holo_dark.png new file mode 100644 index 0000000..eb6e5fa --- /dev/null +++ b/core/res/res/drawable-xhdpi/ic_voice_search_api_holo_dark.png Binary files differ
diff --git a/core/res/res/drawable-xhdpi/ic_voice_search_api_holo_light.png b/core/res/res/drawable-xhdpi/ic_voice_search_api_holo_light.png index c332ba0..c6b40bb 100644 --- a/core/res/res/drawable-xhdpi/ic_voice_search_api_holo_light.png +++ b/core/res/res/drawable-xhdpi/ic_voice_search_api_holo_light.png Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/ic_search_api_holo_dark.png b/core/res/res/drawable-xxhdpi/ic_search_api_holo_dark.png new file mode 100644 index 0000000..eb30465 --- /dev/null +++ b/core/res/res/drawable-xxhdpi/ic_search_api_holo_dark.png Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/ic_search_api_holo_light.png b/core/res/res/drawable-xxhdpi/ic_search_api_holo_light.png new file mode 100644 index 0000000..bc14415 --- /dev/null +++ b/core/res/res/drawable-xxhdpi/ic_search_api_holo_light.png Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/ic_voice_search_api_holo_dark.png b/core/res/res/drawable-xxhdpi/ic_voice_search_api_holo_dark.png new file mode 100644 index 0000000..813048c --- /dev/null +++ b/core/res/res/drawable-xxhdpi/ic_voice_search_api_holo_dark.png Binary files differ
diff --git a/core/res/res/drawable-xxhdpi/ic_voice_search_api_holo_light.png b/core/res/res/drawable-xxhdpi/ic_voice_search_api_holo_light.png new file mode 100644 index 0000000..8addde0 --- /dev/null +++ b/core/res/res/drawable-xxhdpi/ic_voice_search_api_holo_light.png Binary files differ
diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml index 76fbded..7a654e6 100644 --- a/core/res/res/values/themes.xml +++ b/core/res/res/values/themes.xml
@@ -363,7 +363,7 @@ <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="searchViewSearchIcon">@android:drawable/ic_search_api_holo_dark</item> <item name="searchViewGoIcon">@android:drawable/ic_go</item> <item name="searchViewVoiceIcon">@android:drawable/ic_voice_search</item> <item name="searchViewEditQuery">@android:drawable/ic_commit_search_api_holo_dark</item>