Commit 1305b115 by bachinger Committed by Oliver Woodman

Migrate MediaSessionConnector to API 26 for shuffle mode.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166198698
parent f7eba77e
...@@ -232,9 +232,9 @@ public final class MediaSessionConnector { ...@@ -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 { ...@@ -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);
} }
} }
......
...@@ -160,8 +160,8 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu ...@@ -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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment