loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate MediaSessionConnector to API 26 for shuffle mode.

Browse Source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166198698
This commit is contained in:
bachinger 2017-08-23 07:32:53 -07:00 committed by Oliver Woodman
parent f7eba77ee0
commit 1305b1155b
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
View File

@ -232,9 +232,9 @@ public final class MediaSessionConnector {
*/ */
void onSkipToNext(Player player); void onSkipToNext(Player player);
/** /**
* See {@link MediaSessionCompat.Callback#onSetShuffleModeEnabled(boolean)}. * See {@link MediaSessionCompat.Callback#onSetShuffleMode(int)}.
*/ */
void onSetShuffleModeEnabled(Player player, boolean enabled); void onSetShuffleMode(Player player, int shuffleMode);
} }
/** /**
@ -803,15 +803,15 @@ public final class MediaSessionConnector {
@Override @Override
public void onSetShuffleModeEnabled(boolean enabled) { public void onSetShuffleModeEnabled(boolean enabled) {
if (canDispatchToQueueNavigator(PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE_ENABLED)) { if (canDispatchToQueueNavigator(PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE_ENABLED)) {
queueNavigator.onSetShuffleModeEnabled(player, enabled); queueNavigator.onSetShuffleMode(player, enabled
? PlaybackStateCompat.SHUFFLE_MODE_ALL : PlaybackStateCompat.SHUFFLE_MODE_NONE);
} }
} }
@Override @Override
public void onSetShuffleMode(int shuffleMode) { public void onSetShuffleMode(int shuffleMode) {
if (canDispatchToQueueNavigator(PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE_ENABLED)) { if (canDispatchToQueueNavigator(PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE_ENABLED)) {
queueNavigator.onSetShuffleModeEnabled(player, queueNavigator.onSetShuffleMode(player, shuffleMode);
shuffleMode != PlaybackStateCompat.SHUFFLE_MODE_NONE);
} }
} }

4
extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
View File

@ -160,8 +160,8 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
} }
@Override @Override
public void onSetShuffleModeEnabled(Player player, boolean enabled) { public void onSetShuffleMode(Player player, int shuffleMode) {
player.setShuffleModeEnabled(enabled); player.setShuffleModeEnabled(shuffleMode == PlaybackStateCompat.SHUFFLE_MODE_ALL);
} }
private void publishFloatingQueueWindow(Player player) { private void publishFloatingQueueWindow(Player player) {