Merge "Change search text size to 16sp."
diff --git a/res-common/drawable/ic_close_black_24dp.xml b/res-common/drawable/ic_close_black_24dp.xml
new file mode 100644
index 0000000..4ddacdf
--- /dev/null
+++ b/res-common/drawable/ic_close_black_24dp.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 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.
+-->
+
+<!-- 'X' icon (used in multi select mode and search bar). -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0">
+ <path
+ android:fillColor="#000000"
+ android:pathData="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"/>
+</vector>
diff --git a/res-common/layout/search_bar_expanded.xml b/res-common/layout/search_bar_expanded.xml
index b914204..0086c37 100644
--- a/res-common/layout/search_bar_expanded.xml
+++ b/res-common/layout/search_bar_expanded.xml
@@ -53,7 +53,7 @@
android:layout_height="@dimen/search_box_close_icon_size"
android:layout_width="@dimen/search_box_close_icon_size"
android:padding="@dimen/search_box_close_icon_padding"
- android:src="@drawable/ic_close_dk"
+ android:src="@drawable/ic_close_black_24dp"
android:clickable="true"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/description_clear_search"