Merge branch 'master' into Bookmarks

14 files changed, 16 insertions, 47 deletions

diff --git a/res/drawable-hdpi/ic_menu_shuffle_selected.png b/res/drawable-hdpi/ic_menu_shuffle_selected.png
new file mode 100644
index 00000000..e2ace634
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_shuffle_selected.png
diff --git a/res/drawable-mdpi/ic_menu_shuffle_selected.png b/res/drawable-mdpi/ic_menu_shuffle_selected.png
new file mode 100644
index 00000000..c8c01fff
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_shuffle_selected.png
diff --git a/res/drawable-xhdpi/ic_menu_shuffle_selected.png b/res/drawable-xhdpi/ic_menu_shuffle_selected.png
new file mode 100644
index 00000000..03719061
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_shuffle_selected.png
diff --git a/res/drawable-xxhdpi/ic_menu_shuffle_selected.png b/res/drawable-xxhdpi/ic_menu_shuffle_selected.png
new file mode 100644
index 00000000..16cfea54
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_shuffle_selected.png
diff --git a/res/layout/download_media_buttons.xml b/res/layout/download_media_buttons.xml
index 1affb164..1e694662 100644
--- a/res/layout/download_media_buttons.xml
+++ b/res/layout/download_media_buttons.xml
@@ -55,8 +55,8 @@
 
     <ImageButton
             style="@style/PlaybackControl.Small"
-			android:id="@+id/download_toggle_list"
-			android:src="?attr/toggle_list"
+			android:id="@+id/download_shuffle"
+			android:src="?attr/shuffle"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             />
diff --git a/res/menu/nowplaying.xml b/res/menu/nowplaying.xml
index 60255692..3f49ae19 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 bba5ba00..105b375c 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 5b2529e7..c08c6da7 100644
--- a/res/menu/select_album_context.xml
+++ b/res/menu/select_album_context.xml
@@ -11,11 +11,6 @@
         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 a1805f5b..14dbda3a 100644
--- a/res/menu/select_album_context_offline.xml
+++ b/res/menu/select_album_context_offline.xml
@@ -5,12 +5,6 @@
         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 47033d9c..7e12c89f 100644
--- a/res/menu/select_playlist_context.xml
+++ b/res/menu/select_playlist_context.xml
@@ -13,11 +13,6 @@
         />
 		
 	<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 d63aec17..830d6d0c 100644
--- a/res/menu/select_playlist_context_offline.xml
+++ b/res/menu/select_playlist_context_offline.xml
@@ -5,9 +5,4 @@
         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 07fd57a7..c1628d2e 100644
--- a/res/menu/select_song.xml
+++ b/res/menu/select_song.xml
@@ -8,12 +8,6 @@
 		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 c45405fb..5ff42d12 100644
--- a/res/menu/select_song_offline.xml
+++ b/res/menu/select_song_offline.xml
@@ -8,12 +8,6 @@
 		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"/>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 33a40981..71b6e08e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -212,6 +212,8 @@
 	<string name="download.downloading_summary_expanded">Current: %1$s

 		\nEstimated Size: %2$s</string>

 	<string name="download.failed_to_load">Failed to load</string>

+	<string name="download.shuffle_on">Shuffle on</string>

+	<string name="download.shuffle_off">Shuffle off</string>

 

 	<string name="sync.new_podcasts">New podcasts available</string>

 	<string name="sync.new_playlists">New songs in playlists</string>