[Android] Only show the shuffle action if the playlist contains more than two tracks

Robert Stone git at videolan.org
Wed Oct 21 09:02:40 CEST 2020


vlc-android | branch: 3.3.x | Robert Stone <rhstone at gmail.com> | Sun Oct 11 23:56:15 2020 -0700| [88bcbe00cebce67c7c5061691ac93e9093b0cc11] | committer: Nicolas Pomepuy

Only show the shuffle action if the playlist contains more than two tracks

(cherry picked from commit ac3406d07a1c871a0319e7702069499df9f2e24b)

> https://code.videolan.org/videolan/vlc-android/commit/88bcbe00cebce67c7c5061691ac93e9093b0cc11
---

 application/vlc-android/src/org/videolan/vlc/PlaybackService.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/vlc-android/src/org/videolan/vlc/PlaybackService.kt b/application/vlc-android/src/org/videolan/vlc/PlaybackService.kt
index 6f9f3c940a..091423d5ae 100644
--- a/application/vlc-android/src/org/videolan/vlc/PlaybackService.kt
+++ b/application/vlc-android/src/org/videolan/vlc/PlaybackService.kt
@@ -895,13 +895,13 @@ class PlaybackService : MediaBrowserServiceCompat(), LifecycleOwner {
         if (isSeekable)
             actions = actions or PlaybackStateCompat.ACTION_FAST_FORWARD or PlaybackStateCompat.ACTION_REWIND or PlaybackStateCompat.ACTION_SEEK_TO
         actions = actions or PlaybackStateCompat.ACTION_SKIP_TO_QUEUE_ITEM
-        if (playlistManager.hasPlaylist()) actions = actions or PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE
+        if (playlistManager.canShuffle()) actions = actions or PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE
         actions = actions or PlaybackStateCompat.ACTION_SET_REPEAT_MODE
         pscb.setActions(actions)
         mediaSession.setRepeatMode(repeatType)
         mediaSession.setShuffleMode(if (isShuffling) PlaybackStateCompat.SHUFFLE_MODE_ALL else PlaybackStateCompat.SHUFFLE_MODE_NONE)
         val repeatResId = if (repeatType == PlaybackStateCompat.REPEAT_MODE_ALL) R.drawable.ic_auto_repeat_pressed else if (repeatType == PlaybackStateCompat.REPEAT_MODE_ONE) R.drawable.ic_auto_repeat_one_pressed else R.drawable.ic_auto_repeat_normal
-        if (playlistManager.hasPlaylist())
+        if (playlistManager.canShuffle())
             pscb.addCustomAction("shuffle", getString(R.string.shuffle_title), if (isShuffling) R.drawable.ic_auto_shuffle_pressed else R.drawable.ic_auto_shuffle_normal)
         pscb.addCustomAction("repeat", getString(R.string.repeat_title), repeatResId)
 



More information about the Android mailing list