diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 5dcebc04be..696e4a02ab 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -47,6 +47,9 @@ This release corresponds to the * Ensure TalkBack announces the currently active speed option in the playback controls menu ([#10298](https://github.com/google/ExoPlayer/issues/10298)). + * Use current overrides of the player as preset in + `TrackSelectionDialogBuilder` + ([#10429](https://github.com/google/ExoPlayer/issues/10429)). * RTSP: * Add RTP reader for H263 ([#63](https://github.com/androidx/media/pull/63)). diff --git a/libraries/ui/src/main/java/androidx/media3/ui/TrackSelectionDialogBuilder.java b/libraries/ui/src/main/java/androidx/media3/ui/TrackSelectionDialogBuilder.java index 11cf8424ec..6cacef3ceb 100644 --- a/libraries/ui/src/main/java/androidx/media3/ui/TrackSelectionDialogBuilder.java +++ b/libraries/ui/src/main/java/androidx/media3/ui/TrackSelectionDialogBuilder.java @@ -67,7 +67,7 @@ public interface DialogCallback { private boolean showDisableOption; @Nullable private TrackNameProvider trackNameProvider; private boolean isDisabled; - private Map overrides; + private ImmutableMap overrides; @Nullable private Comparator trackFormatComparator; /** @@ -87,7 +87,7 @@ public TrackSelectionDialogBuilder( this.title = title; this.trackGroups = ImmutableList.copyOf(trackGroups); this.callback = callback; - overrides = Collections.emptyMap(); + overrides = ImmutableMap.of(); } /** @@ -110,7 +110,7 @@ public TrackSelectionDialogBuilder( trackGroups.add(trackGroup); } } - overrides = Collections.emptyMap(); + overrides = player.getTrackSelectionParameters().overrides; callback = (isDisabled, overrides) -> { TrackSelectionParameters.Builder parametersBuilder = @@ -171,7 +171,7 @@ public TrackSelectionDialogBuilder setOverride(@Nullable TrackSelectionOverride */ public TrackSelectionDialogBuilder setOverrides( Map overrides) { - this.overrides = overrides; + this.overrides = ImmutableMap.copyOf(overrides); return this; }