From eaca7e8c966cb085096486b7e1d27e349e7c7aa8 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Mon, 30 May 2016 16:51:09 -0500
Subject: Fixes #690: Modernize the action bar search with SearchView

---
 app/src/main/res/menu/abstract_top_menu.xml | 3 ++-
 app/src/main/res/menu/main.xml              | 5 +++--
 app/src/main/res/menu/search.xml            | 3 ++-
 app/src/main/res/menu/select_artist.xml     | 5 +++--
 app/src/main/res/menu/select_podcasts.xml   | 5 +++--
 5 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'app/src/main/res/menu')

diff --git a/app/src/main/res/menu/abstract_top_menu.xml b/app/src/main/res/menu/abstract_top_menu.xml
index 7c8d414d..b768879d 100644
--- a/app/src/main/res/menu/abstract_top_menu.xml
+++ b/app/src/main/res/menu/abstract_top_menu.xml
@@ -5,7 +5,8 @@
 		android:id="@+id/menu_global_search"
 		android:icon="?attr/search"
 		android:title="@string/menu.search"
-		compat:showAsAction="always|withText"/>
+		compat:actionViewClass="android.support.v7.widget.SearchView"
+		compat:showAsAction="always|collapseActionView"/>
 
 	<group android:id="@+id/not_touchscreen">
 		<item
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
index 0970c8ce..4b542668 100644
--- a/app/src/main/res/menu/main.xml
+++ b/app/src/main/res/menu/main.xml
@@ -5,13 +5,14 @@
 		android:id="@+id/menu_global_search"
 		android:icon="?attr/search"
 		android:title="@string/menu.search"
-		compat:showAsAction="always|withText"/>
+		compat:actionViewClass="android.support.v7.widget.SearchView"
+		compat:showAsAction="ifRoom|collapseActionView"/>
 	
 	<item 
 		android:id="@+id/menu_global_shuffle"
 		android:icon="?attr/shuffle"
 		android:title="@string/menu.shuffle"
-		compat:showAsAction="always|withText"/>
+		compat:showAsAction="ifRoom|withText"/>
 
 	<group android:id="@+id/madsonic">
 		<item
diff --git a/app/src/main/res/menu/search.xml b/app/src/main/res/menu/search.xml
index e9377d68..b957a1e4 100644
--- a/app/src/main/res/menu/search.xml
+++ b/app/src/main/res/menu/search.xml
@@ -5,7 +5,8 @@
 		android:id="@+id/menu_global_search"
 		android:icon="?attr/search"
 		android:title="@string/menu.search"
-		compat:showAsAction="ifRoom|withText"/>
+		compat:actionViewClass="android.support.v7.widget.SearchView"
+		compat:showAsAction="always|collapseActionView"/>
 
 	<item 
 		android:id="@+id/menu_exit"
diff --git a/app/src/main/res/menu/select_artist.xml b/app/src/main/res/menu/select_artist.xml
index f94cda8b..e974c28e 100644
--- a/app/src/main/res/menu/select_artist.xml
+++ b/app/src/main/res/menu/select_artist.xml
@@ -5,13 +5,14 @@
 		android:id="@+id/menu_global_search"
 		android:icon="?attr/search"
 		android:title="@string/menu.search"
-		compat:showAsAction="always|withText"/>
+		compat:actionViewClass="android.support.v7.widget.SearchView"
+		compat:showAsAction="ifRoom|collapseActionView"/>
 
 	<item 
 		android:id="@+id/menu_global_shuffle"
 		android:icon="?attr/shuffle"
 		android:title="@string/menu.shuffle"
-		compat:showAsAction="always|withText"/>
+		compat:showAsAction="ifRoom|withText"/>
 
 	<group android:id="@+id/not_touchscreen">
 		<item
diff --git a/app/src/main/res/menu/select_podcasts.xml b/app/src/main/res/menu/select_podcasts.xml
index 41ad62fa..25bb6188 100644
--- a/app/src/main/res/menu/select_podcasts.xml
+++ b/app/src/main/res/menu/select_podcasts.xml
@@ -5,13 +5,14 @@
 		android:id="@+id/menu_global_search"
 		android:icon="?attr/search"
 		android:title="@string/menu.search"
-		compat:showAsAction="always|withText"/>
+		compat:actionViewClass="android.support.v7.widget.SearchView"
+		compat:showAsAction="ifRoom|collapseActionView"/>
 
 	<item 
 		android:id="@+id/menu_add_podcast"
 		android:icon="?attr/add"
 		android:title="@string/menu.add_podcast"
-		compat:showAsAction="always|withText"/>
+		compat:showAsAction="ifRoom|withText"/>
 
 	<group android:id="@+id/not_touchscreen">
 		<item
-- 
cgit v1.2.3