Skip to content

SDK / exoplayer

Go to a project
Commit b3e7696b by tonihei Committed by christosts
Options

Tweak UI behavior when commands are missing. 

For most missing commands, we already disable the corresponding
controls. This change extends this to more UI elements that are
disabled in case the corresponding action is unavailable.

#minor-release

PiperOrigin-RevId: 505057751
parent b27cc568
Inline Side-by-side
Showing with 59 additions and 14 deletions
libraries/ui/src/main/java/androidx/media3/ui/PlayerControlView.java
...@@ -1010,7 +1010,10 @@ public class PlayerControlView extends FrameLayout { ...@@ -1010,7 +1010,10 @@ public class PlayerControlView extends FrameLayout {
boolean enableFastForward = false; boolean enableFastForward = false;
boolean enableNext = false; boolean enableNext = false;
if (player != null) { if (player != null) {
enableSeeking = player.isCommandAvailable(COMMAND_SEEK_IN_CURRENT_MEDIA_ITEM); enableSeeking =
(showMultiWindowTimeBar && canShowMultiWindowTimeBar(player, window))
? player.isCommandAvailable(COMMAND_SEEK_TO_MEDIA_ITEM)
: player.isCommandAvailable(COMMAND_SEEK_IN_CURRENT_MEDIA_ITEM);
enablePrevious = player.isCommandAvailable(COMMAND_SEEK_TO_PREVIOUS); enablePrevious = player.isCommandAvailable(COMMAND_SEEK_TO_PREVIOUS);
enableRewind = player.isCommandAvailable(COMMAND_SEEK_BACK); enableRewind = player.isCommandAvailable(COMMAND_SEEK_BACK);
enableFastForward = player.isCommandAvailable(COMMAND_SEEK_FORWARD); enableFastForward = player.isCommandAvailable(COMMAND_SEEK_FORWARD);
...@@ -1126,6 +1129,7 @@ public class PlayerControlView extends FrameLayout { ...@@ -1126,6 +1129,7 @@ public class PlayerControlView extends FrameLayout {
private void updateTrackLists() { private void updateTrackLists() {
initTrackSelectionAdapter(); initTrackSelectionAdapter();
updateButton(textTrackSelectionAdapter.getItemCount() > 0, subtitleButton); updateButton(textTrackSelectionAdapter.getItemCount() > 0, subtitleButton);
updateSettingsButton();
} }
private void initTrackSelectionAdapter() { private void initTrackSelectionAdapter() {
...@@ -1301,6 +1305,11 @@ public class PlayerControlView extends FrameLayout { ...@@ -1301,6 +1305,11 @@ public class PlayerControlView extends FrameLayout {
playbackSpeedAdapter.updateSelectedIndex(player.getPlaybackParameters().speed); playbackSpeedAdapter.updateSelectedIndex(player.getPlaybackParameters().speed);
settingsAdapter.setSubTextAtPosition( settingsAdapter.setSubTextAtPosition(
SETTINGS_PLAYBACK_SPEED_POSITION, playbackSpeedAdapter.getSelectedText()); SETTINGS_PLAYBACK_SPEED_POSITION, playbackSpeedAdapter.getSelectedText());
updateSettingsButton();
}
private void updateSettingsButton() {
updateButton(settingsAdapter.hasSettingsToShow(), settingsButton);
} }
private void updateSettingsWindowSize() { private void updateSettingsWindowSize() {
...@@ -1354,8 +1363,8 @@ public class PlayerControlView extends FrameLayout { ...@@ -1354,8 +1363,8 @@ public class PlayerControlView extends FrameLayout {
} }
private void seekToTimeBarPosition(Player player, long positionMs) { private void seekToTimeBarPosition(Player player, long positionMs) {
if (multiWindowTimeBar if (multiWindowTimeBar) {
&& player.isCommandAvailable(COMMAND_GET_TIMELINE) if (player.isCommandAvailable(COMMAND_GET_TIMELINE)
&& player.isCommandAvailable(COMMAND_SEEK_TO_MEDIA_ITEM)) { && player.isCommandAvailable(COMMAND_SEEK_TO_MEDIA_ITEM)) {
Timeline timeline = player.getCurrentTimeline(); Timeline timeline = player.getCurrentTimeline();
int windowCount = timeline.getWindowCount(); int windowCount = timeline.getWindowCount();
...@@ -1373,6 +1382,7 @@ public class PlayerControlView extends FrameLayout { ...@@ -1373,6 +1382,7 @@ public class PlayerControlView extends FrameLayout {
windowIndex++; windowIndex++;
} }
player.seekTo(windowIndex, positionMs); player.seekTo(windowIndex, positionMs);
}
} else if (player.isCommandAvailable(COMMAND_SEEK_IN_CURRENT_MEDIA_ITEM)) { } else if (player.isCommandAvailable(COMMAND_SEEK_IN_CURRENT_MEDIA_ITEM)) {
player.seekTo(positionMs); player.seekTo(positionMs);
} }
...@@ -1584,15 +1594,14 @@ public class PlayerControlView extends FrameLayout { ...@@ -1584,15 +1594,14 @@ public class PlayerControlView extends FrameLayout {
* @return Whether the specified timeline can be shown on a multi-window time bar. * @return Whether the specified timeline can be shown on a multi-window time bar.
*/ */
private static boolean canShowMultiWindowTimeBar(Player player, Timeline.Window window) { private static boolean canShowMultiWindowTimeBar(Player player, Timeline.Window window) {
if (!player.isCommandAvailable(COMMAND_GET_TIMELINE) if (!player.isCommandAvailable(COMMAND_GET_TIMELINE)) {
|| !player.isCommandAvailable(COMMAND_SEEK_TO_MEDIA_ITEM)) {
return false; return false;
} }
Timeline timeline = player.getCurrentTimeline(); Timeline timeline = player.getCurrentTimeline();
if (timeline.getWindowCount() > MAX_WINDOWS_FOR_MULTI_WINDOW_TIME_BAR) { int windowCount = timeline.getWindowCount();
if (windowCount <= 1 || windowCount > MAX_WINDOWS_FOR_MULTI_WINDOW_TIME_BAR) {
return false; return false;
} }
int windowCount = timeline.getWindowCount();
for (int i = 0; i < windowCount; i++) { for (int i = 0; i < windowCount; i++) {
if (timeline.getWindow(i, window).durationUs == C.TIME_UNSET) { if (timeline.getWindow(i, window).durationUs == C.TIME_UNSET) {
return false; return false;
...@@ -1635,17 +1644,24 @@ public class PlayerControlView extends FrameLayout { ...@@ -1635,17 +1644,24 @@ public class PlayerControlView extends FrameLayout {
@Override @Override
public void onEvents(Player player, Events events) { public void onEvents(Player player, Events events) {
if (events.containsAny(EVENT_PLAYBACK_STATE_CHANGED, EVENT_PLAY_WHEN_READY_CHANGED)) { if (events.containsAny(
EVENT_PLAYBACK_STATE_CHANGED,
EVENT_PLAY_WHEN_READY_CHANGED,
EVENT_AVAILABLE_COMMANDS_CHANGED)) {
updatePlayPauseButton(); updatePlayPauseButton();
} }
if (events.containsAny( if (events.containsAny(
EVENT_PLAYBACK_STATE_CHANGED, EVENT_PLAY_WHEN_READY_CHANGED, EVENT_IS_PLAYING_CHANGED)) { EVENT_PLAYBACK_STATE_CHANGED,
EVENT_PLAY_WHEN_READY_CHANGED,
EVENT_IS_PLAYING_CHANGED,
EVENT_AVAILABLE_COMMANDS_CHANGED)) {
updateProgress(); updateProgress();
} }
if (events.contains(EVENT_REPEAT_MODE_CHANGED)) { if (events.containsAny(EVENT_REPEAT_MODE_CHANGED, EVENT_AVAILABLE_COMMANDS_CHANGED)) {
updateRepeatModeButton(); updateRepeatModeButton();
} }
if (events.contains(EVENT_SHUFFLE_MODE_ENABLED_CHANGED)) { if (events.containsAny(
EVENT_SHUFFLE_MODE_ENABLED_CHANGED, EVENT_AVAILABLE_COMMANDS_CHANGED)) {
updateShuffleButton(); updateShuffleButton();
} }
if (events.containsAny( if (events.containsAny(
...@@ -1658,13 +1674,14 @@ public class PlayerControlView extends FrameLayout { ...@@ -1658,13 +1674,14 @@ public class PlayerControlView extends FrameLayout {
EVENT_AVAILABLE_COMMANDS_CHANGED)) { EVENT_AVAILABLE_COMMANDS_CHANGED)) {
updateNavigation(); updateNavigation();
} }
if (events.containsAny(EVENT_POSITION_DISCONTINUITY, EVENT_TIMELINE_CHANGED)) { if (events.containsAny(
EVENT_POSITION_DISCONTINUITY, EVENT_TIMELINE_CHANGED, EVENT_AVAILABLE_COMMANDS_CHANGED)) {
updateTimeline(); updateTimeline();
} }
if (events.contains(EVENT_PLAYBACK_PARAMETERS_CHANGED)) { if (events.containsAny(EVENT_PLAYBACK_PARAMETERS_CHANGED, EVENT_AVAILABLE_COMMANDS_CHANGED)) {
updatePlaybackSpeedList(); updatePlaybackSpeedList();
} }
if (events.contains(EVENT_TRACKS_CHANGED)) { if (events.containsAny(EVENT_TRACKS_CHANGED, EVENT_AVAILABLE_COMMANDS_CHANGED)) {
updateTrackLists(); updateTrackLists();
} }
} }
...@@ -1774,6 +1791,14 @@ public class PlayerControlView extends FrameLayout { ...@@ -1774,6 +1791,14 @@ public class PlayerControlView extends FrameLayout {
@Override @Override
public void onBindViewHolder(SettingViewHolder holder, int position) { public void onBindViewHolder(SettingViewHolder holder, int position) {
if (shouldShowSetting(position)) {
holder.itemView.setLayoutParams(
new RecyclerView.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
} else {
holder.itemView.setLayoutParams(new RecyclerView.LayoutParams(0, 0));
}
holder.mainTextView.setText(mainTexts[position]); holder.mainTextView.setText(mainTexts[position]);
if (subTexts[position] == null) { if (subTexts[position] == null) {
...@@ -1802,6 +1827,26 @@ public class PlayerControlView extends FrameLayout { ...@@ -1802,6 +1827,26 @@ public class PlayerControlView extends FrameLayout {
public void setSubTextAtPosition(int position, String subText) { public void setSubTextAtPosition(int position, String subText) {
this.subTexts[position] = subText; this.subTexts[position] = subText;
} }
public boolean hasSettingsToShow() {
return shouldShowSetting(SETTINGS_AUDIO_TRACK_SELECTION_POSITION)
|| shouldShowSetting(SETTINGS_PLAYBACK_SPEED_POSITION);
}
private boolean shouldShowSetting(int position) {
if (player == null) {
return false;
}
switch (position) {
case SETTINGS_AUDIO_TRACK_SELECTION_POSITION:
return player.isCommandAvailable(COMMAND_GET_TRACKS)
&& player.isCommandAvailable(COMMAND_SET_TRACK_SELECTION_PARAMETERS);
case SETTINGS_PLAYBACK_SPEED_POSITION:
return player.isCommandAvailable(COMMAND_SET_SPEED_AND_PITCH);
default:
return true;
}
}
} }
private final class SettingViewHolder extends RecyclerView.ViewHolder { private final class SettingViewHolder extends RecyclerView.ViewHolder {
......
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