#405 Reverse changes to shuffle, too much negative feedback

8 files changed, 45 insertions, 12 deletions

diff --git a/res/menu/nowplaying.xml b/res/menu/nowplaying.xml
index 3f49ae19..60255692 100644
--- a/res/menu/nowplaying.xml
+++ b/res/menu/nowplaying.xml
@@ -3,18 +3,18 @@
 	  xmlns:compat="http://schemas.android.com/apk/res-auto"
 	  android:checkableBehavior="all">
 
+    <item
+        android:id="@+id/menu_shuffle"
+        android:icon="?attr/shuffle"
+        android:title="@string/download.menu_shuffle"
+        compat:showAsAction="ifRoom|withText"/>
+
 	<item
 		android:id="@+id/menu_mediaroute"
 		compat:actionProviderClass="android.support.v7.app.MediaRouteActionProvider"
 		compat:actionViewClass="android.support.v7.app.MediaRouteButton"
 		compat:showAsAction="always"
 		android:title="@string/menu.cast"/>
-
-    <item
-        android:id="@+id/menu_toggle_list"
-        android:icon="?attr/toggle_list"
-        android:title="@string/download.menu_toggle"
-        compat:showAsAction="ifRoom|withText"/>
 		
 	<item
         android:id="@+id/menu_remove_all"
diff --git a/res/menu/nowplaying_offline.xml b/res/menu/nowplaying_offline.xml
index 105b375c..bba5ba00 100644
--- a/res/menu/nowplaying_offline.xml
+++ b/res/menu/nowplaying_offline.xml
@@ -2,18 +2,18 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
 		xmlns:compat="http://schemas.android.com/apk/res-auto">
 
+    <item
+        android:id="@+id/menu_shuffle"
+        android:icon="?attr/shuffle"
+        android:title="@string/download.menu_shuffle"
+        compat:showAsAction="always|withText"/>
+
 	<item
 		android:id="@+id/menu_mediaroute"
 		compat:actionProviderClass="android.support.v7.app.MediaRouteActionProvider"
 		compat:actionViewClass="android.support.v7.app.MediaRouteButton"
 		compat:showAsAction="always"
 		android:title="@string/menu.cast"/>
-
-    <item
-        android:id="@+id/menu_toggle_list"
-        android:icon="?attr/toggle_list"
-		android:title="@string/download.menu_toggle"
-        compat:showAsAction="always|withText"/>
 		
 	<item
         android:id="@+id/menu_remove_all"
diff --git a/res/menu/select_album_context.xml b/res/menu/select_album_context.xml
index c08c6da7..5b2529e7 100644
--- a/res/menu/select_album_context.xml
+++ b/res/menu/select_album_context.xml
@@ -11,6 +11,11 @@
         android:id="@+id/album_menu_play_now"
         android:title="@string/common.play_now"
         />
+		
+	<item 
+        android:id="@+id/album_menu_play_shuffled"
+        android:title="@string/common.play_shuffled"
+        />
 
 	<group android:id="@+id/hide_play_next">
 		<item
diff --git a/res/menu/select_album_context_offline.xml b/res/menu/select_album_context_offline.xml
index 14dbda3a..a1805f5b 100644
--- a/res/menu/select_album_context_offline.xml
+++ b/res/menu/select_album_context_offline.xml
@@ -5,6 +5,12 @@
         android:id="@+id/album_menu_play_now"
         android:title="@string/common.play_now"
         />
+		
+	<item 
+        android:id="@+id/album_menu_play_shuffled"
+        android:title="@string/common.play_shuffled"
+        />
+
 	<group android:id="@+id/hide_play_next">
 		<item
 			android:id="@+id/album_menu_play_next"
diff --git a/res/menu/select_playlist_context.xml b/res/menu/select_playlist_context.xml
index 7e12c89f..47033d9c 100644
--- a/res/menu/select_playlist_context.xml
+++ b/res/menu/select_playlist_context.xml
@@ -13,6 +13,11 @@
         />
 		
 	<item 
+        android:id="@+id/playlist_menu_play_shuffled"
+        android:title="@string/common.play_shuffled"
+        />
+		
+	<item 
         android:id="@+id/playlist_menu_download"
         android:title="@string/common.download"
         />
diff --git a/res/menu/select_playlist_context_offline.xml b/res/menu/select_playlist_context_offline.xml
index 830d6d0c..d63aec17 100644
--- a/res/menu/select_playlist_context_offline.xml
+++ b/res/menu/select_playlist_context_offline.xml
@@ -5,4 +5,9 @@
         android:id="@+id/playlist_menu_play_now"
         android:title="@string/common.play_now"
         />
+		
+	<item 
+        android:id="@+id/playlist_menu_play_shuffled"
+        android:title="@string/common.play_shuffled"
+        />        
 </menu>
\ No newline at end of file
diff --git a/res/menu/select_song.xml b/res/menu/select_song.xml
index c1628d2e..07fd57a7 100644
--- a/res/menu/select_song.xml
+++ b/res/menu/select_song.xml
@@ -8,6 +8,12 @@
 		compat:showAsAction="always|withText"/>
 		
 	<item 
+		android:id="@+id/menu_shuffle"
+		android:icon="?attr/shuffle"
+		android:title="@string/menu.shuffle"
+		compat:showAsAction="ifRoom|withText"/>
+		
+	<item 
 		android:id="@+id/menu_download"
 		android:title="@string/common.download"/>
 		
diff --git a/res/menu/select_song_offline.xml b/res/menu/select_song_offline.xml
index 5ff42d12..c45405fb 100644
--- a/res/menu/select_song_offline.xml
+++ b/res/menu/select_song_offline.xml
@@ -8,6 +8,12 @@
 		compat:showAsAction="always|withText"/>
 		
 	<item 
+		android:id="@+id/menu_shuffle"
+		android:icon="?attr/shuffle"
+		android:title="@string/menu.shuffle"
+		compat:showAsAction="ifRoom|withText"/>
+		
+	<item 
 		android:id="@+id/menu_delete"
 		android:title="@string/menu.delete_cache"/>