From b5d360c4cd7e308a173867f1564ff88589600929 Mon Sep 17 00:00:00 2001 From: olly Date: Mon, 1 Mar 2021 15:35:24 +0000 Subject: [PATCH] Fix scrubber not reappearing correctly in some cases Issue: #8646 #minor-release PiperOrigin-RevId: 360184586 --- RELEASENOTES.md | 3 +++ .../exoplayer2/ui/StyledPlayerControlViewLayoutManager.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index fbf8c46d3b..6c9c9756e9 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -37,6 +37,9 @@ video tracks (previously separate acquire and release events were dispatched for each track in each period). * Include the session state in DRM session-acquired listener methods. +* UI + * Fix `StyledPlayerView` scrubber not reappearing correctly in some cases + ([#8646](https://github.com/google/ExoPlayer/issues/8646)). * MediaSession extension: Remove dependency to core module and rely on common only. The `TimelineQueueEditor` uses a new `MediaDescriptionConverter` for this purpose and does not rely on the `ConcatenatingMediaSource` anymore. diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlViewLayoutManager.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlViewLayoutManager.java index 4045559ccb..3b901fc6ea 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlViewLayoutManager.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/StyledPlayerControlViewLayoutManager.java @@ -607,7 +607,7 @@ import java.util.List; defaultTimeBar.hideScrubber(/* disableScrubberPadding= */ true); } else if (uxState == UX_STATE_ONLY_PROGRESS_VISIBLE) { defaultTimeBar.hideScrubber(/* disableScrubberPadding= */ false); - } else if (uxState != UX_STATE_ANIMATING_HIDE && uxState != UX_STATE_ANIMATING_SHOW) { + } else if (uxState != UX_STATE_ANIMATING_HIDE) { defaultTimeBar.showScrubber(); } }