aboutsummaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/ic_menu_shuffle_selected.pngbin0 -> 1138 bytes
-rw-r--r--res/drawable-mdpi/ic_menu_shuffle_selected.pngbin0 -> 733 bytes
-rw-r--r--res/drawable-xhdpi/ic_menu_shuffle_selected.pngbin0 -> 1670 bytes
-rw-r--r--res/drawable-xxhdpi/ic_menu_shuffle_selected.pngbin0 -> 2573 bytes
-rw-r--r--res/layout/download_media_buttons.xml4
-rw-r--r--res/menu/nowplaying.xml12
-rw-r--r--res/menu/nowplaying_offline.xml12
-rw-r--r--res/values/strings.xml2
8 files changed, 16 insertions, 14 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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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/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>