loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make getCustomLayoutFromMediaButtonPreferences side-effect free

Browse Source 
The method currently modifies the input Bundle, but it's easier to
reason about it if the method is side-effect free and the places
that need to modify a Bundle do this after calling the method.

PiperOrigin-RevId: 693288031
This commit is contained in:
tonihei 2024-11-05 03:51:59 -08:00 committed by Copybara-Service
parent 76e4abe428
commit 9fb4ed91b6
6 changed files with 216 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
libraries/session/src/main/java/androidx/media3/session/CommandButton.java
View File

@ -1179,17 +1179,17 @@ public final class CommandButton {
* custom layout} according to the implicit button placement rules applied for custom layouts.
*
* @param mediaButtonPreferences The list of buttons as media button preferences.
* @param reservationExtras A writable {@link Bundle} that receives the extras for slot
* reservations via {@link MediaConstants#EXTRAS_KEY_SLOT_RESERVATION_SEEK_TO_NEXT} or {@link
* MediaConstants#EXTRAS_KEY_SLOT_RESERVATION_SEEK_TO_PREV} to match the returned custom
* layout.
* @return A list of buttons compatible with the placement rules of custom layouts.
* @param backSlotAllowed Whether the custom layout can put a button into {@link #SLOT_BACK}.
* @param forwardSlotAllowed Whether the custom layout can put a button into {@link
* #SLOT_FORWARD}.
* @return A list of buttons compatible with the placement rules of custom layouts. The buttons
* will have their intended slots assigned as the only option.
*/
/* package */ static ImmutableList<CommandButton> getCustomLayoutFromMediaButtonPreferences(
List<CommandButton> mediaButtonPreferences, Bundle reservationExtras) {
List<CommandButton> mediaButtonPreferences,
boolean backSlotAllowed,
boolean forwardSlotAllowed) {
if (mediaButtonPreferences.isEmpty()) {
reservationExtras.putBoolean(MediaConstants.EXTRAS_KEY_SLOT_RESERVATION_SEEK_TO_PREV, true);
reservationExtras.putBoolean(MediaConstants.EXTRAS_KEY_SLOT_RESERVATION_SEEK_TO_NEXT, true);
return ImmutableList.of();
}
int backButtonIndex = C.INDEX_UNSET;
@ -1201,35 +1201,52 @@ public final class CommandButton {
if (slot == SLOT_OVERFLOW) {
// Will go into overflow.
break;
} else if (backButtonIndex == C.INDEX_UNSET && slot == SLOT_BACK) {
} else if (backSlotAllowed && backButtonIndex == C.INDEX_UNSET && slot == SLOT_BACK) {
backButtonIndex = i;
} else if (forwardButtonIndex == C.INDEX_UNSET && slot == SLOT_FORWARD) {
break;
} else if (forwardSlotAllowed
&& forwardButtonIndex == C.INDEX_UNSET
&& slot == SLOT_FORWARD) {
forwardButtonIndex = i;
break;
}
}
}
boolean hasBackButton = backButtonIndex != C.INDEX_UNSET;
boolean hasForwardButton = forwardButtonIndex != C.INDEX_UNSET;
reservationExtras.putBoolean(
MediaConstants.EXTRAS_KEY_SLOT_RESERVATION_SEEK_TO_PREV, !hasBackButton);
reservationExtras.putBoolean(
MediaConstants.EXTRAS_KEY_SLOT_RESERVATION_SEEK_TO_NEXT, !hasForwardButton);
ImmutableList.Builder<CommandButton> customLayout = ImmutableList.builder();
if (hasBackButton) {
customLayout.add(mediaButtonPreferences.get(backButtonIndex));
if (backButtonIndex != C.INDEX_UNSET) {
customLayout.add(
mediaButtonPreferences
.get(backButtonIndex)
.copyWithSlots(ImmutableIntArray.of(SLOT_BACK)));
}
if (hasForwardButton) {
customLayout.add(mediaButtonPreferences.get(forwardButtonIndex));
if (forwardButtonIndex != C.INDEX_UNSET) {
customLayout.add(
mediaButtonPreferences
.get(forwardButtonIndex)
.copyWithSlots(ImmutableIntArray.of(SLOT_FORWARD)));
}
for (int i = 0; i < mediaButtonPreferences.size(); i++) {
CommandButton button = mediaButtonPreferences.get(i);
if (i != backButtonIndex && i != forwardButtonIndex && button.slots.contains(SLOT_OVERFLOW)) {
customLayout.add(button);
customLayout.add(button.copyWithSlots(ImmutableIntArray.of(SLOT_OVERFLOW)));
}
}
return customLayout.build();
}
/**
* Returns whether the provided list of buttons contains a button for a given {@link Slot}. This
* method assumes the slots have been resolved and there is only a single slot per button.
*/
/* package */ static boolean containsButtonForSlot(List<CommandButton> buttons, @Slot int slot) {
for (int i = 0; i < buttons.size(); i++) {
if (buttons.get(i).slots.get(0) == slot) {
return true;
}
}
return false;
}
/**
* Converts a list of buttons defined according to the implicit button placement rules for
* {@linkplain MediaSession#getCustomLayout custom layouts} to {@linkplain

7
libraries/session/src/main/java/androidx/media3/session/ConnectionState.java
View File

@ -131,10 +131,13 @@ import java.util.List;
mediaButtonPreferences, CommandButton::toBundle));
} else {
// Controller doesn't support media button preferences, send the list as a custom layout.
// Ignore reservation extras as they were not directly supported in older controllers.
// TODO: b/332877990 - Improve this logic to take allowed command and session extras for
// this controller into account instead of assuming all slots are allowed.
ImmutableList<CommandButton> customLayout =
CommandButton.getCustomLayoutFromMediaButtonPreferences(
mediaButtonPreferences, /* reservationExtras= */ new Bundle());
mediaButtonPreferences,
/* backSlotAllowed= */ true,
/* forwardSlotAllowed= */ true);
bundle.putParcelableArrayList(
FIELD_CUSTOM_LAYOUT,
BundleCollectionUtil.toBundleArrayList(customLayout, CommandButton::toBundle));

7
libraries/session/src/main/java/androidx/media3/session/DefaultMediaNotificationProvider.java
View File

@ -445,14 +445,13 @@ public class DefaultMediaNotificationProvider implements MediaNotification.Provi
Player.Commands playerCommands,
ImmutableList<CommandButton> mediaButtonPreferences,
boolean showPauseButton) {
Bundle reservations = new Bundle();
ImmutableList<CommandButton> customLayout =
CommandButton.getCustomLayoutFromMediaButtonPreferences(
mediaButtonPreferences, reservations);
mediaButtonPreferences, /* backSlotAllowed= */ true, /* forwardSlotAllowed= */ true);
boolean hasCustomBackButton =
!reservations.getBoolean(MediaConstants.EXTRAS_KEY_SLOT_RESERVATION_SEEK_TO_PREV);
CommandButton.containsButtonForSlot(customLayout, CommandButton.SLOT_BACK);
boolean hasCustomForwardButton =
!reservations.getBoolean(MediaConstants.EXTRAS_KEY_SLOT_RESERVATION_SEEK_TO_NEXT);
CommandButton.containsButtonForSlot(customLayout, CommandButton.SLOT_FORWARD);
int nextCustomLayoutIndex = 0;
ImmutableList.Builder<CommandButton> commandButtons = new ImmutableList.Builder<>();

7
libraries/session/src/main/java/androidx/media3/session/MediaSessionStub.java
View File

@ -2085,10 +2085,13 @@ import java.util.concurrent.ExecutionException;
BundleCollectionUtil.toBundleList(mediaButtonPreferences, CommandButton::toBundle));
} else {
// Controller doesn't support media button preferences, send the list as a custom layout.
// Ignore reservation extras as they were not directly supported in older controllers.
// TODO: b/332877990 - Improve this logic to take allowed command and session extras for
// this controller into account instead of assuming all slots are allowed.
ImmutableList<CommandButton> customLayout =
CommandButton.getCustomLayoutFromMediaButtonPreferences(
mediaButtonPreferences, /* reservationExtras= */ new Bundle());
mediaButtonPreferences,
/* backSlotAllowed= */ true,
/* forwardSlotAllowed= */ true);
iController.onSetCustomLayout(
sequenceNumber,
BundleCollectionUtil.toBundleList(customLayout, CommandButton::toBundle));

33
libraries/session/src/main/java/androidx/media3/session/PlayerWrapper.java
View File

@ -107,9 +107,7 @@ import java.util.List;
this.availablePlayerCommands = availablePlayerCommands;
this.legacyExtras = legacyExtras;
if (!mediaButtonPreferences.isEmpty()) {
this.customLayout =
CommandButton.getCustomLayoutFromMediaButtonPreferences(
mediaButtonPreferences, this.legacyExtras);
updateCustomLayoutAndLegacyExtrasForMediaButtonPreferences();
}
}
@ -143,18 +141,16 @@ import java.util.List;
this.mediaButtonPreferences = mediaButtonPreferences;
boolean hadPrevReservation =
legacyExtras.getBoolean(
MediaConstants.EXTRAS_KEY_SLOT_RESERVATION_SEEK_TO_PREV, /* defaultVale= */ false);
MediaConstants.EXTRAS_KEY_SLOT_RESERVATION_SEEK_TO_PREV, /* defaultValue= */ false);
boolean hadNextReservation =
legacyExtras.getBoolean(
MediaConstants.EXTRAS_KEY_SLOT_RESERVATION_SEEK_TO_NEXT, /* defaultVale= */ false);
this.customLayout =
CommandButton.getCustomLayoutFromMediaButtonPreferences(
mediaButtonPreferences, legacyExtras);
MediaConstants.EXTRAS_KEY_SLOT_RESERVATION_SEEK_TO_NEXT, /* defaultValue= */ false);
updateCustomLayoutAndLegacyExtrasForMediaButtonPreferences();
return (legacyExtras.getBoolean(
MediaConstants.EXTRAS_KEY_SLOT_RESERVATION_SEEK_TO_PREV, /* defaultVale= */ false)
MediaConstants.EXTRAS_KEY_SLOT_RESERVATION_SEEK_TO_PREV, /* defaultValue= */ false)
!= hadPrevReservation)
|| (legacyExtras.getBoolean(
MediaConstants.EXTRAS_KEY_SLOT_RESERVATION_SEEK_TO_NEXT, /* defaultVale= */ false)
MediaConstants.EXTRAS_KEY_SLOT_RESERVATION_SEEK_TO_NEXT, /* defaultValue= */ false)
!= hadNextReservation);
}
@ -169,12 +165,11 @@ import java.util.List;
public void setLegacyExtras(Bundle extras) {
checkArgument(!extras.containsKey(EXTRAS_KEY_PLAYBACK_SPEED_COMPAT));
checkArgument(!extras.containsKey(EXTRAS_KEY_MEDIA_ID_COMPAT));
this.legacyExtras = extras;
if (!mediaButtonPreferences.isEmpty()) {
// Re-calculate custom layout in case we have to set any additional extras.
this.customLayout =
CommandButton.getCustomLayoutFromMediaButtonPreferences(mediaButtonPreferences, extras);
updateCustomLayoutAndLegacyExtrasForMediaButtonPreferences();
}
this.legacyExtras = extras;
}
public Bundle getLegacyExtras() {
@ -1309,6 +1304,18 @@ import java.util.List;
checkState(Looper.myLooper() == getApplicationLooper());
}
private void updateCustomLayoutAndLegacyExtrasForMediaButtonPreferences() {
customLayout =
CommandButton.getCustomLayoutFromMediaButtonPreferences(
mediaButtonPreferences, /* backSlotAllowed= */ true, /* forwardSlotAllowed= */ true);
legacyExtras.putBoolean(
MediaConstants.EXTRAS_KEY_SLOT_RESERVATION_SEEK_TO_PREV,
!CommandButton.containsButtonForSlot(customLayout, CommandButton.SLOT_BACK));
legacyExtras.putBoolean(
MediaConstants.EXTRAS_KEY_SLOT_RESERVATION_SEEK_TO_NEXT,
!CommandButton.containsButtonForSlot(customLayout, CommandButton.SLOT_FORWARD));
}
@SuppressWarnings("deprecation") // Uses deprecated PlaybackStateCompat actions.
private static long convertCommandToPlaybackStateActions(@Command int command) {
switch (command) {

185
libraries/session/src/test/java/androidx/media3/session/CommandButtonTest.java
View File

@ -560,29 +560,22 @@ public class CommandButtonTest {
.setPlayerCommand(Player.COMMAND_SEEK_TO_PREVIOUS)
.setSlots(CommandButton.SLOT_BACK_SECONDARY, CommandButton.SLOT_OVERFLOW)
.build());
Bundle reservationBundle = new Bundle();
ImmutableList<CommandButton> customLayout =
CommandButton.getCustomLayoutFromMediaButtonPreferences(
mediaButtonPreferences, reservationBundle);
mediaButtonPreferences, /* backSlotAllowed= */ true, /* forwardSlotAllowed= */ true);
assertThat(customLayout)
.containsExactly(
new CommandButton.Builder(CommandButton.ICON_ALBUM)
.setPlayerCommand(Player.COMMAND_PREPARE)
.setSlots(CommandButton.SLOT_OVERFLOW, CommandButton.SLOT_BACK)
.setSlots(CommandButton.SLOT_OVERFLOW)
.build(),
new CommandButton.Builder(CommandButton.ICON_REWIND)
.setPlayerCommand(Player.COMMAND_SEEK_TO_PREVIOUS)
.setSlots(CommandButton.SLOT_BACK_SECONDARY, CommandButton.SLOT_OVERFLOW)
.setSlots(CommandButton.SLOT_OVERFLOW)
.build())
.inOrder();
assertThat(
reservationBundle.getBoolean(MediaConstants.EXTRAS_KEY_SLOT_RESERVATION_SEEK_TO_PREV))
.isTrue();
assertThat(
reservationBundle.getBoolean(MediaConstants.EXTRAS_KEY_SLOT_RESERVATION_SEEK_TO_NEXT))
.isTrue();
}
@Test
@ -605,33 +598,69 @@ public class CommandButtonTest {
.setPlayerCommand(Player.COMMAND_SEEK_TO_PREVIOUS)
.setSlots(CommandButton.SLOT_BACK_SECONDARY, CommandButton.SLOT_OVERFLOW)
.build());
Bundle reservationBundle = new Bundle();
ImmutableList<CommandButton> customLayout =
CommandButton.getCustomLayoutFromMediaButtonPreferences(
mediaButtonPreferences, reservationBundle);
mediaButtonPreferences, /* backSlotAllowed= */ true, /* forwardSlotAllowed= */ true);
assertThat(customLayout)
.containsExactly(
new CommandButton.Builder(CommandButton.ICON_PREVIOUS)
.setPlayerCommand(Player.COMMAND_SEEK_TO_PREVIOUS)
.setSlots(CommandButton.SLOT_BACK, CommandButton.SLOT_OVERFLOW)
.setSlots(CommandButton.SLOT_BACK)
.build(),
new CommandButton.Builder(CommandButton.ICON_ALBUM)
.setPlayerCommand(Player.COMMAND_PREPARE)
.setSlots(CommandButton.SLOT_OVERFLOW)
.build(),
new CommandButton.Builder(CommandButton.ICON_REWIND)
.setPlayerCommand(Player.COMMAND_SEEK_TO_PREVIOUS)
.setSlots(CommandButton.SLOT_OVERFLOW)
.build())
.inOrder();
}
@Test
public void
getCustomLayoutFromMediaButtonPreferences_withBackSlotButNoBackSlotAllowed_returnsCorrectButtons() {
ImmutableList<CommandButton> mediaButtonPreferences =
ImmutableList.of(
new CommandButton.Builder(CommandButton.ICON_ALBUM)
.setPlayerCommand(Player.COMMAND_PREPARE)
.setSlots(CommandButton.SLOT_OVERFLOW, CommandButton.SLOT_BACK)
.build(),
new CommandButton.Builder(CommandButton.ICON_PREVIOUS)
.setPlayerCommand(Player.COMMAND_SEEK_TO_PREVIOUS)
.setSlots(CommandButton.SLOT_BACK, CommandButton.SLOT_OVERFLOW)
.build(),
new CommandButton.Builder(CommandButton.ICON_NEXT)
.setPlayerCommand(Player.COMMAND_SEEK_TO_NEXT)
.setSlots(CommandButton.SLOT_FORWARD_SECONDARY)
.build(),
new CommandButton.Builder(CommandButton.ICON_REWIND)
.setPlayerCommand(Player.COMMAND_SEEK_TO_PREVIOUS)
.setSlots(CommandButton.SLOT_BACK_SECONDARY, CommandButton.SLOT_OVERFLOW)
.build());
ImmutableList<CommandButton> customLayout =
CommandButton.getCustomLayoutFromMediaButtonPreferences(
mediaButtonPreferences, /* backSlotAllowed= */ false, /* forwardSlotAllowed= */ true);
assertThat(customLayout)
.containsExactly(
new CommandButton.Builder(CommandButton.ICON_ALBUM)
.setPlayerCommand(Player.COMMAND_PREPARE)
.setSlots(CommandButton.SLOT_OVERFLOW)
.build(),
new CommandButton.Builder(CommandButton.ICON_PREVIOUS)
.setPlayerCommand(Player.COMMAND_SEEK_TO_PREVIOUS)
.setSlots(CommandButton.SLOT_OVERFLOW)
.build(),
new CommandButton.Builder(CommandButton.ICON_REWIND)
.setPlayerCommand(Player.COMMAND_SEEK_TO_PREVIOUS)
.setSlots(CommandButton.SLOT_OVERFLOW)
.build())
.inOrder();
assertThat(
reservationBundle.getBoolean(MediaConstants.EXTRAS_KEY_SLOT_RESERVATION_SEEK_TO_PREV))
.isFalse();
assertThat(
reservationBundle.getBoolean(MediaConstants.EXTRAS_KEY_SLOT_RESERVATION_SEEK_TO_NEXT))
.isTrue();
}
@Test
@ -654,33 +683,69 @@ public class CommandButtonTest {
.setPlayerCommand(Player.COMMAND_SEEK_TO_PREVIOUS)
.setSlots(CommandButton.SLOT_BACK_SECONDARY, CommandButton.SLOT_OVERFLOW)
.build());
Bundle reservationBundle = new Bundle();
ImmutableList<CommandButton> customLayout =
CommandButton.getCustomLayoutFromMediaButtonPreferences(
mediaButtonPreferences, reservationBundle);
mediaButtonPreferences, /* backSlotAllowed= */ true, /* forwardSlotAllowed= */ true);
assertThat(customLayout)
.containsExactly(
new CommandButton.Builder(CommandButton.ICON_NEXT)
.setPlayerCommand(Player.COMMAND_SEEK_TO_NEXT)
.setSlots(CommandButton.SLOT_FORWARD, CommandButton.SLOT_OVERFLOW)
.setSlots(CommandButton.SLOT_FORWARD)
.build(),
new CommandButton.Builder(CommandButton.ICON_ALBUM)
.setPlayerCommand(Player.COMMAND_PREPARE)
.setSlots(CommandButton.SLOT_OVERFLOW)
.build(),
new CommandButton.Builder(CommandButton.ICON_REWIND)
.setPlayerCommand(Player.COMMAND_SEEK_TO_PREVIOUS)
.setSlots(CommandButton.SLOT_OVERFLOW)
.build())
.inOrder();
}
@Test
public void
getCustomLayoutFromMediaButtonPreferences_withForwardSlotButNoForwardSlotAllowed_returnsCorrectButtons() {
ImmutableList<CommandButton> mediaButtonPreferences =
ImmutableList.of(
new CommandButton.Builder(CommandButton.ICON_ALBUM)
.setPlayerCommand(Player.COMMAND_PREPARE)
.setSlots(CommandButton.SLOT_OVERFLOW, CommandButton.SLOT_FORWARD)
.build(),
new CommandButton.Builder(CommandButton.ICON_NEXT)
.setPlayerCommand(Player.COMMAND_SEEK_TO_NEXT)
.setSlots(CommandButton.SLOT_FORWARD, CommandButton.SLOT_OVERFLOW)
.build(),
new CommandButton.Builder(CommandButton.ICON_NEXT)
.setPlayerCommand(Player.COMMAND_SEEK_TO_NEXT)
.setSlots(CommandButton.SLOT_FORWARD_SECONDARY)
.build(),
new CommandButton.Builder(CommandButton.ICON_REWIND)
.setPlayerCommand(Player.COMMAND_SEEK_TO_PREVIOUS)
.setSlots(CommandButton.SLOT_BACK_SECONDARY, CommandButton.SLOT_OVERFLOW)
.build());
ImmutableList<CommandButton> customLayout =
CommandButton.getCustomLayoutFromMediaButtonPreferences(
mediaButtonPreferences, /* backSlotAllowed= */ true, /* forwardSlotAllowed= */ false);
assertThat(customLayout)
.containsExactly(
new CommandButton.Builder(CommandButton.ICON_ALBUM)
.setPlayerCommand(Player.COMMAND_PREPARE)
.setSlots(CommandButton.SLOT_OVERFLOW)
.build(),
new CommandButton.Builder(CommandButton.ICON_NEXT)
.setPlayerCommand(Player.COMMAND_SEEK_TO_NEXT)
.setSlots(CommandButton.SLOT_OVERFLOW)
.build(),
new CommandButton.Builder(CommandButton.ICON_REWIND)
.setPlayerCommand(Player.COMMAND_SEEK_TO_PREVIOUS)
.setSlots(CommandButton.SLOT_OVERFLOW)
.build())
.inOrder();
assertThat(
reservationBundle.getBoolean(MediaConstants.EXTRAS_KEY_SLOT_RESERVATION_SEEK_TO_PREV))
.isTrue();
assertThat(
reservationBundle.getBoolean(MediaConstants.EXTRAS_KEY_SLOT_RESERVATION_SEEK_TO_NEXT))
.isFalse();
}
@Test
@ -708,37 +773,77 @@ public class CommandButtonTest {
.setPlayerCommand(Player.COMMAND_SEEK_TO_PREVIOUS)
.setSlots(CommandButton.SLOT_CENTRAL, CommandButton.SLOT_BACK)
.build());
Bundle reservationBundle = new Bundle();
ImmutableList<CommandButton> customLayout =
CommandButton.getCustomLayoutFromMediaButtonPreferences(
mediaButtonPreferences, reservationBundle);
mediaButtonPreferences, /* backSlotAllowed= */ true, /* forwardSlotAllowed= */ true);
assertThat(customLayout)
.containsExactly(
new CommandButton.Builder(CommandButton.ICON_PREVIOUS)
.setPlayerCommand(Player.COMMAND_SEEK_TO_PREVIOUS)
.setSlots(CommandButton.SLOT_CENTRAL, CommandButton.SLOT_BACK)
.setSlots(CommandButton.SLOT_BACK)
.build(),
new CommandButton.Builder(CommandButton.ICON_NEXT)
.setPlayerCommand(Player.COMMAND_SEEK_TO_NEXT)
.setSlots(CommandButton.SLOT_FORWARD)
.build(),
new CommandButton.Builder(CommandButton.ICON_ALBUM)
.setPlayerCommand(Player.COMMAND_PREPARE)
.setSlots(CommandButton.SLOT_OVERFLOW)
.build(),
new CommandButton.Builder(CommandButton.ICON_REWIND)
.setPlayerCommand(Player.COMMAND_SEEK_TO_PREVIOUS)
.setSlots(CommandButton.SLOT_OVERFLOW)
.build())
.inOrder();
}
@Test
public void
getCustomLayoutFromMediaButtonPreferences_withForwardAndBackSlotButNoForwardBackSlotsAllowed_returnsCorrectButtons() {
ImmutableList<CommandButton> mediaButtonPreferences =
ImmutableList.of(
new CommandButton.Builder(CommandButton.ICON_ALBUM)
.setPlayerCommand(Player.COMMAND_PREPARE)
.setSlots(CommandButton.SLOT_OVERFLOW, CommandButton.SLOT_FORWARD)
.build(),
new CommandButton.Builder(CommandButton.ICON_NEXT)
.setPlayerCommand(Player.COMMAND_SEEK_TO_NEXT)
.setSlots(CommandButton.SLOT_FORWARD, CommandButton.SLOT_OVERFLOW)
.build(),
new CommandButton.Builder(CommandButton.ICON_ALBUM)
.setPlayerCommand(Player.COMMAND_PREPARE)
.setSlots(CommandButton.SLOT_OVERFLOW, CommandButton.SLOT_FORWARD)
new CommandButton.Builder(CommandButton.ICON_NEXT)
.setPlayerCommand(Player.COMMAND_SEEK_TO_NEXT)
.setSlots(CommandButton.SLOT_FORWARD_SECONDARY)
.build(),
new CommandButton.Builder(CommandButton.ICON_REWIND)
.setPlayerCommand(Player.COMMAND_SEEK_TO_PREVIOUS)
.setSlots(CommandButton.SLOT_BACK_SECONDARY, CommandButton.SLOT_OVERFLOW)
.build(),
new CommandButton.Builder(CommandButton.ICON_PREVIOUS)
.setPlayerCommand(Player.COMMAND_SEEK_TO_PREVIOUS)
.setSlots(CommandButton.SLOT_CENTRAL, CommandButton.SLOT_BACK)
.build());
ImmutableList<CommandButton> customLayout =
CommandButton.getCustomLayoutFromMediaButtonPreferences(
mediaButtonPreferences, /* backSlotAllowed= */ false, /* forwardSlotAllowed= */ false);
assertThat(customLayout)
.containsExactly(
new CommandButton.Builder(CommandButton.ICON_ALBUM)
.setPlayerCommand(Player.COMMAND_PREPARE)
.setSlots(CommandButton.SLOT_OVERFLOW)
.build(),
new CommandButton.Builder(CommandButton.ICON_NEXT)
.setPlayerCommand(Player.COMMAND_SEEK_TO_NEXT)
.setSlots(CommandButton.SLOT_OVERFLOW)
.build(),
new CommandButton.Builder(CommandButton.ICON_REWIND)
.setPlayerCommand(Player.COMMAND_SEEK_TO_PREVIOUS)
.setSlots(CommandButton.SLOT_OVERFLOW)
.build())
.inOrder();
assertThat(
reservationBundle.getBoolean(MediaConstants.EXTRAS_KEY_SLOT_RESERVATION_SEEK_TO_PREV))
.isFalse();
assertThat(
reservationBundle.getBoolean(MediaConstants.EXTRAS_KEY_SLOT_RESERVATION_SEEK_TO_NEXT))
.isFalse();
}
@Test