Commit c95e43d9 by samrobinson Committed by Andrew Lewis

Do not require subtitleButton in custom layouts of StyledPlayerView

Every other subtitleButton has an if not null check, but does not force non null.

Issue: #7962
PiperOrigin-RevId: 334124323
parent 151a3d3b
......@@ -17,6 +17,9 @@
([#7866](https://github.com/google/ExoPlayer/issues/7866)).
* Text:
* Add support for `\h` SSA/ASS style override code (non-breaking space).
* UI:
* Do not require subtitleButton in custom layouts of StyledPlayerView
([#7962](https://github.com/google/ExoPlayer/issues/7962)).
* Audio:
* Retry playback after some types of `AudioTrack` error.
* Extractors:
......
......@@ -2005,11 +2005,13 @@ public class StyledPlayerControlView extends FrameLayout {
break;
}
}
checkNotNull(subtitleButton)
.setImageDrawable(subtitleIsOn ? subtitleOnButtonDrawable : subtitleOffButtonDrawable);
checkNotNull(subtitleButton)
.setContentDescription(
subtitleIsOn ? subtitleOnContentDescription : subtitleOffContentDescription);
if (subtitleButton != null) {
subtitleButton.setImageDrawable(
subtitleIsOn ? subtitleOnButtonDrawable : subtitleOffButtonDrawable);
subtitleButton.setContentDescription(
subtitleIsOn ? subtitleOnContentDescription : subtitleOffContentDescription);
}
this.rendererIndices = rendererIndices;
this.tracks = trackInfos;
this.mappedTrackInfo = mappedTrackInfo;
......
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