From 25bb8e411bee7263e2e92a1a086fc2f46ed1961d Mon Sep 17 00:00:00 2001 From: oceanjules Date: Tue, 10 Sep 2024 19:44:02 +0100 Subject: [PATCH] Make setFullscreenButtonState UnstableApi --- RELEASENOTES.md | 5 ++--- .../java/androidx/media3/ui/PlayerControlView.java | 10 ++++------ .../src/main/java/androidx/media3/ui/PlayerView.java | 7 ++++--- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 2e5f5a9f5e..61452f12d6 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -50,10 +50,9 @@ [#1594](https://github.com/androidx/media/issues/1594)). * Add `setFullscreenButtonState` to `PlayerView` to allow updates of fullscreen button's icon on demand, i.e. out-of-band and not reactively - to a click interaction. + to a click interaction ([#1590](https://github.com/androidx/media/issues/1590), - [#184](https://github.com/androidx/media/issues/184), - [#10391](https://github.com/google/ExoPlayer/issues/10391)) + [#184](https://github.com/androidx/media/issues/184)). * Downloads: * OkHttp Extension: * Cronet Extension: diff --git a/libraries/ui/src/main/java/androidx/media3/ui/PlayerControlView.java b/libraries/ui/src/main/java/androidx/media3/ui/PlayerControlView.java index 7d8eda1a20..f19d4e90b5 100644 --- a/libraries/ui/src/main/java/androidx/media3/ui/PlayerControlView.java +++ b/libraries/ui/src/main/java/androidx/media3/ui/PlayerControlView.java @@ -1582,16 +1582,14 @@ public class PlayerControlView extends FrameLayout { * Updates whether the controller is in fullscreen, changing its fullscreen icon and reports it to * to the listener. * - *

For {@code isFullscreen} equals {@code true} the icon will be set to {@link - * R.drawable#exo_styled_controls_fullscreen_exit} or else {@link - * R.drawable#exo_styled_controls_fullscreen_enter}. + *

For {@code isFullscreen} equals {@code true} the icon will be set to + * {@code @drawable/exo_styled_controls_fullscreen_exit} or else + * {@code @drawable/exo_styled_controls_fullscreen_enter}. * * @param isFullscreen If the view is in full screen. */ public void updateIsFullscreen(boolean isFullscreen) { - boolean fullscreenModeChanged = this.isFullScreen != isFullscreen; - - if (!fullscreenModeChanged) { + if (this.isFullScreen == isFullscreen) { return; } diff --git a/libraries/ui/src/main/java/androidx/media3/ui/PlayerView.java b/libraries/ui/src/main/java/androidx/media3/ui/PlayerView.java index 9d051e8dd9..535802b098 100644 --- a/libraries/ui/src/main/java/androidx/media3/ui/PlayerView.java +++ b/libraries/ui/src/main/java/androidx/media3/ui/PlayerView.java @@ -1142,12 +1142,13 @@ public class PlayerView extends FrameLayout implements AdViewProvider { /** * Sets whether the player is currently in fullscreen, this will change the displayed icon. * - *

If {@code isFullscreen} is {@code true}, {@link - * R.drawable#exo_styled_controls_fullscreen_exit} will be displayed or else {@link - * R.drawable#exo_styled_controls_fullscreen_enter}. + *

If {@code isFullscreen} is {@code true}, + * {@code @drawable/exo_styled_controls_fullscreen_exit} will be displayed or else + * {@code @drawable/exo_styled_controls_fullscreen_enter}. * * @param isFullscreen Whether the player is currently in fullscreen. */ + @UnstableApi public void setFullscreenButtonState(boolean isFullscreen) { Assertions.checkStateNotNull(controller); controller.updateIsFullscreen(isFullscreen);