Merge "Add UX assets for the Material-compatible search icon" into ub-mail-master

15 files changed, 6 insertions, 6 deletions

diff --git a/res/drawable-hdpi-v21/ic_menu_search.png b/res/drawable-hdpi-v21/ic_menu_search.png
new file mode 100644
index 000000000..f1e32036f
--- /dev/null
+++ b/res/drawable-hdpi-v21/ic_menu_search.png
diff --git a/res/drawable-hdpi/ic_menu_search_holo_light.png b/res/drawable-hdpi/ic_menu_search.png
index 898adf131..898adf131 100644
--- a/res/drawable-hdpi/ic_menu_search_holo_light.png
+++ b/res/drawable-hdpi/ic_menu_search.png
diff --git a/res/drawable-mdpi-v21/ic_menu_search.png b/res/drawable-mdpi-v21/ic_menu_search.png
new file mode 100644
index 000000000..1e5dfb4e3
--- /dev/null
+++ b/res/drawable-mdpi-v21/ic_menu_search.png
diff --git a/res/drawable-mdpi/ic_menu_search_holo_light.png b/res/drawable-mdpi/ic_menu_search.png
index 3311684b7..3311684b7 100644
--- a/res/drawable-mdpi/ic_menu_search_holo_light.png
+++ b/res/drawable-mdpi/ic_menu_search.png
diff --git a/res/drawable-xhdpi-v21/ic_menu_search.png b/res/drawable-xhdpi-v21/ic_menu_search.png
new file mode 100644
index 000000000..70338a15c
--- /dev/null
+++ b/res/drawable-xhdpi-v21/ic_menu_search.png
diff --git a/res/drawable-xhdpi/ic_menu_search_holo_light.png b/res/drawable-xhdpi/ic_menu_search.png
index 528fa1d99..528fa1d99 100644
--- a/res/drawable-xhdpi/ic_menu_search_holo_light.png
+++ b/res/drawable-xhdpi/ic_menu_search.png
diff --git a/res/drawable-xxhdpi-v21/ic_menu_search.png b/res/drawable-xxhdpi-v21/ic_menu_search.png
new file mode 100644
index 000000000..226d27e25
--- /dev/null
+++ b/res/drawable-xxhdpi-v21/ic_menu_search.png
diff --git a/res/drawable-xxhdpi/ic_menu_search_holo_light.png b/res/drawable-xxhdpi/ic_menu_search.png
index 483e8ee75..483e8ee75 100644
--- a/res/drawable-xxhdpi/ic_menu_search_holo_light.png
+++ b/res/drawable-xxhdpi/ic_menu_search.png
diff --git a/res/drawable-xxxhdpi-v21/ic_menu_search.png b/res/drawable-xxxhdpi-v21/ic_menu_search.png
new file mode 100644
index 000000000..9b6da5705
--- /dev/null
+++ b/res/drawable-xxxhdpi-v21/ic_menu_search.png
diff --git a/res/menu-sw600dp-land/conversation_actions.xml b/res/menu-sw600dp-land/conversation_actions.xml
index f61d58b00..b8b172c68 100644
--- a/res/menu-sw600dp-land/conversation_actions.xml
+++ b/res/menu-sw600dp-land/conversation_actions.xml
@@ -29,7 +29,7 @@
     <item android:id="@+id/search"
         android:title="@string/menu_search"
         android:showAsAction="always|collapseActionView"
-        android:icon="@drawable/ic_menu_search_holo_light"
+        android:icon="@drawable/ic_menu_search"
         android:actionLayout="@layout/mail_actionbar_searchview" />
 
     <!-- Depends on AccountCapabilities.ARCHIVE and
diff --git a/res/menu-sw600dp-land/conversation_list_search_results_actions.xml b/res/menu-sw600dp-land/conversation_list_search_results_actions.xml
index 42cbfd6f6..a9448a8aa 100644
--- a/res/menu-sw600dp-land/conversation_list_search_results_actions.xml
+++ b/res/menu-sw600dp-land/conversation_list_search_results_actions.xml
@@ -26,7 +26,7 @@
     <item android:id="@+id/search"
         android:title="@string/menu_search"
         android:showAsAction="always|collapseActionView"
-        android:icon="@drawable/ic_menu_search_holo_light"
+        android:icon="@drawable/ic_menu_search"
         android:actionLayout="@layout/mail_actionbar_searchview" />
 
     <item
diff --git a/res/menu-sw600dp/conversation_list_menu.xml b/res/menu-sw600dp/conversation_list_menu.xml
index 03858c5e8..07eb865d0 100644
--- a/res/menu-sw600dp/conversation_list_menu.xml
+++ b/res/menu-sw600dp/conversation_list_menu.xml
@@ -29,7 +29,7 @@
     <item android:id="@+id/search"
         android:title="@string/menu_search"
         android:showAsAction="always|collapseActionView"
-        android:icon="@drawable/ic_menu_search_holo_light"
+        android:icon="@drawable/ic_menu_search"
         android:actionLayout="@layout/mail_actionbar_searchview" />
 
     <item android:id="@+id/refresh"
diff --git a/res/menu/conversation_list_menu.xml b/res/menu/conversation_list_menu.xml
index c858421fa..7ce02b181 100644
--- a/res/menu/conversation_list_menu.xml
+++ b/res/menu/conversation_list_menu.xml
@@ -28,7 +28,7 @@
       that supports FOLDER_SERVER_SEARCH -->
     <item android:id="@+id/search" android:title="@string/menu_search"
         android:showAsAction="ifRoom|collapseActionView"
-        android:icon="@drawable/ic_menu_search_holo_light"
+        android:icon="@drawable/ic_menu_search"
         android:actionLayout="@layout/mail_actionbar_searchview" />
 
     <!-- Available only in the trash folder, when the account supports emptying it -->
diff --git a/res/menu/conversation_list_search_results_actions.xml b/res/menu/conversation_list_search_results_actions.xml
index 15769c971..cf19b1b11 100644
--- a/res/menu/conversation_list_search_results_actions.xml
+++ b/res/menu/conversation_list_search_results_actions.xml
@@ -27,7 +27,7 @@
     <item android:id="@+id/search"
         android:title="@string/menu_search"
         android:showAsAction="ifRoom|collapseActionView"
-        android:icon="@drawable/ic_menu_search_holo_light"
+        android:icon="@drawable/ic_menu_search"
         android:actionLayout="@layout/mail_actionbar_searchview" />
 
     <item android:id="@+id/refresh"
diff --git a/res/xml/searchable.xml b/res/xml/searchable.xml
index 9e3122565..20c98ac1c 100644
--- a/res/xml/searchable.xml
+++ b/res/xml/searchable.xml
@@ -21,7 +21,7 @@
 <searchable xmlns:android="http://schemas.android.com/apk/res/android"
     android:label="@string/search_title"
     android:hint="@string/search_hint"
-    android:icon="@drawable/ic_menu_search_holo_light"
+    android:icon="@drawable/ic_menu_search"
     android:searchSuggestIntentAction="android.intent.action.SEARCH"
     android:searchSuggestAuthority="com.android.mail"
     android:imeOptions="actionSearch" />