aboutsummaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/ic_menu_shuffle_selected.pngbin1138 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_menu_shuffle_selected.pngbin733 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_menu_shuffle_selected.pngbin1670 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_menu_shuffle_selected.pngbin2573 -> 0 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/menu/select_album_context.xml5
-rw-r--r--res/menu/select_album_context_offline.xml6
-rw-r--r--res/menu/select_playlist_context.xml5
-rw-r--r--res/menu/select_playlist_context_offline.xml5
-rw-r--r--res/menu/select_song.xml6
-rw-r--r--res/menu/select_song_offline.xml6
-rw-r--r--res/values/strings.xml2
-rw-r--r--res/xml/changelog.xml1
15 files changed, 47 insertions, 17 deletions
diff --git a/res/drawable-hdpi/ic_menu_shuffle_selected.png b/res/drawable-hdpi/ic_menu_shuffle_selected.png
deleted file mode 100644
index e2ace634..00000000
--- a/res/drawable-hdpi/ic_menu_shuffle_selected.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_shuffle_selected.png b/res/drawable-mdpi/ic_menu_shuffle_selected.png
deleted file mode 100644
index c8c01fff..00000000
--- a/res/drawable-mdpi/ic_menu_shuffle_selected.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_shuffle_selected.png b/res/drawable-xhdpi/ic_menu_shuffle_selected.png
deleted file mode 100644
index 03719061..00000000
--- a/res/drawable-xhdpi/ic_menu_shuffle_selected.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_menu_shuffle_selected.png b/res/drawable-xxhdpi/ic_menu_shuffle_selected.png
deleted file mode 100644
index 16cfea54..00000000
--- a/res/drawable-xxhdpi/ic_menu_shuffle_selected.png
+++ /dev/null
Binary files differ
diff --git a/res/layout/download_media_buttons.xml b/res/layout/download_media_buttons.xml
index 1e694662..1affb164 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_shuffle"
- android:src="?attr/shuffle"
+ android:id="@+id/download_toggle_list"
+ android:src="?attr/toggle_list"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
/>
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"/>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 71b6e08e..33a40981 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -212,8 +212,6 @@
<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>
diff --git a/res/xml/changelog.xml b/res/xml/changelog.xml
index 46fef498..5c8bb024 100644
--- a/res/xml/changelog.xml
+++ b/res/xml/changelog.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<changelog>
<release version="4.8.2" versioncode="129" releasedate="10/30/2014">
- <change>Changed from shuffle option to persistent shuffle toggle</change>
<change>Improve automatic bookmark logic</change>
<change>Tasker: Toggle online/offline</change>
<change>Tasker: Set start/end year + genre for shuffle</change>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-31 20:14:15 +0000