diff options
author | linus_lee <llee@cyngn.com> | 2014-11-25 18:13:15 -0800 |
---|---|---|
committer | linus_lee <llee@cyngn.com> | 2014-12-09 12:02:08 -0800 |
commit | cb83a720c4c358eb7657298dbcf940d029e5af1c (patch) | |
tree | daf3b21b046e0287e443715b9205117446d3cacb /src | |
parent | ad606c2e575a45174ac81f18ee34985616458d0c (diff) | |
download | android_packages_apps_Eleven-cb83a720c4c358eb7657298dbcf940d029e5af1c.tar.gz android_packages_apps_Eleven-cb83a720c4c358eb7657298dbcf940d029e5af1c.tar.bz2 android_packages_apps_Eleven-cb83a720c4c358eb7657298dbcf940d029e5af1c.zip |
Eleven: Make album art show up more consistently in shuffle and not repeat
A more complete fix needs a music service rewrite - I've tried to find a
complete solution that doesn't need a rewrite but cannot figure out a good one
For now this will make all of them but the first one of the next round show up
https://cyanogen.atlassian.net/browse/MUSIC-189
Change-Id: Idd64754001a679cf9a9b16f71d285e0fb4dd1b6d
Diffstat (limited to 'src')
-rw-r--r-- | src/com/cyngn/eleven/MusicPlaybackService.java | 11 | ||||
-rw-r--r-- | src/com/cyngn/eleven/ui/fragments/AudioPlayerFragment.java | 5 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/com/cyngn/eleven/MusicPlaybackService.java b/src/com/cyngn/eleven/MusicPlaybackService.java index 674a3a4..3a202d1 100644 --- a/src/com/cyngn/eleven/MusicPlaybackService.java +++ b/src/com/cyngn/eleven/MusicPlaybackService.java @@ -1223,13 +1223,12 @@ public class MusicPlaybackService extends Service { } } - // if we've played each track at least once - if (minNumPlays > 0) { - // if we aren't repeating all and we're not forcing a track - // return no more tracks - if (mRepeatMode != REPEAT_ALL && !force) { + // if we've played each track at least once and all tracks have been played an equal + // # of times and we aren't repeating all and we're not forcing a track, then + // return no more tracks + if (minNumPlays > 0 && numTracksWithMinNumPlays == numTracks + && mRepeatMode != REPEAT_ALL && !force) { return -1; - } } // else pick a track from the least number of played tracks diff --git a/src/com/cyngn/eleven/ui/fragments/AudioPlayerFragment.java b/src/com/cyngn/eleven/ui/fragments/AudioPlayerFragment.java index 1a2d966..5fd0ca3 100644 --- a/src/com/cyngn/eleven/ui/fragments/AudioPlayerFragment.java +++ b/src/com/cyngn/eleven/ui/fragments/AudioPlayerFragment.java @@ -769,6 +769,11 @@ public class AudioPlayerFragment extends Fragment implements ServiceConnection, final AudioPlayerFragment audioPlayerFragment = mReference.get(); final String action = intent.getAction(); if (action.equals(MusicPlaybackService.META_CHANGED)) { + // if we are repeating current and the track has changed, re-create the adapter + if (MusicUtils.getRepeatMode() == MusicPlaybackService.REPEAT_CURRENT) { + mReference.get().createAndSetAdapter(); + } + // Current info audioPlayerFragment.updateNowPlayingInfo(); audioPlayerFragment.dismissPopupMenu(); |