mirror of
https://github.com/androidx/media.git
synced 2025-05-07 15:40:37 +08:00
Fix FFWD/RWND color in night mode
The color set via textAppearance is overridden by any non-null textColor set directly on the style. We always want the specific properties the textAppearance specifies, so set them directly to prevent them from being overridden. #minor-release Issue: google/ExoPlayer#9765 PiperOrigin-RevId: 414967143
This commit is contained in:
parent
a92e48e5f8
commit
dff04b343e
@ -59,11 +59,16 @@
|
|||||||
([#2882](https://github.com/google/ExoPlayer/issues/2882)).
|
([#2882](https://github.com/google/ExoPlayer/issues/2882)).
|
||||||
* Correctly populate `Format.label` for audio only HLS streams
|
* Correctly populate `Format.label` for audio only HLS streams
|
||||||
([#9608](https://github.com/google/ExoPlayer/issues/9608)).
|
([#9608](https://github.com/google/ExoPlayer/issues/9608)).
|
||||||
* Transformer: increase required min API version to 21.
|
* UI:
|
||||||
* MediaSession extension
|
* Fix the color of the numbers in `StyledPlayerView` rewind and
|
||||||
|
fastforward buttons when using certain themes
|
||||||
|
([#9765](https://github.com/google/ExoPlayer/issues/9765)).
|
||||||
|
* Transformer:
|
||||||
|
* Increase required min API version to 21.
|
||||||
|
* MediaSession extension:
|
||||||
* Remove deprecated call to `onStop(/* reset= */ true)` and provide an
|
* Remove deprecated call to `onStop(/* reset= */ true)` and provide an
|
||||||
opt-out flag for apps that don't want to clear the playlist on stop.
|
opt-out flag for apps that don't want to clear the playlist on stop.
|
||||||
* RTSP
|
* RTSP:
|
||||||
* Provide a client API to override the `SocketFactory` used for any server
|
* Provide a client API to override the `SocketFactory` used for any server
|
||||||
connection ([#9606](https://github.com/google/ExoPlayer/pull/9606)).
|
connection ([#9606](https://github.com/google/ExoPlayer/pull/9606)).
|
||||||
|
|
||||||
|
@ -92,9 +92,11 @@
|
|||||||
<item name="android:foreground">@drawable/exo_styled_controls_fastforward</item>
|
<item name="android:foreground">@drawable/exo_styled_controls_fastforward</item>
|
||||||
<item name="android:gravity">center|bottom</item>
|
<item name="android:gravity">center|bottom</item>
|
||||||
<item name="android:paddingBottom">@dimen/exo_icon_padding_bottom</item>
|
<item name="android:paddingBottom">@dimen/exo_icon_padding_bottom</item>
|
||||||
<item name="android:textAppearance">@style/ExoStyledControls.ButtonText</item>
|
<item name="android:textStyle">bold</item>
|
||||||
|
<item name="android:textSize">@dimen/exo_icon_text_size</item>
|
||||||
|
<item name="android:textColor">@color/exo_white</item>
|
||||||
<!-- Needed for https://github.com/google/ExoPlayer/issues/7898 -->
|
<!-- Needed for https://github.com/google/ExoPlayer/issues/7898 -->
|
||||||
<item name="backgroundTint">@android:color/white</item>
|
<item name="backgroundTint">@color/exo_white</item>
|
||||||
<item name="android:insetBottom">0dp</item>
|
<item name="android:insetBottom">0dp</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
@ -102,16 +104,12 @@
|
|||||||
<item name="android:foreground">@drawable/exo_styled_controls_rewind</item>
|
<item name="android:foreground">@drawable/exo_styled_controls_rewind</item>
|
||||||
<item name="android:gravity">center|bottom</item>
|
<item name="android:gravity">center|bottom</item>
|
||||||
<item name="android:paddingBottom">@dimen/exo_icon_padding_bottom</item>
|
<item name="android:paddingBottom">@dimen/exo_icon_padding_bottom</item>
|
||||||
<item name="android:textAppearance">@style/ExoStyledControls.ButtonText</item>
|
|
||||||
<!-- Needed for https://github.com/google/ExoPlayer/issues/7898 -->
|
|
||||||
<item name="backgroundTint">@android:color/white</item>
|
|
||||||
<item name="android:insetBottom">0dp</item>
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<style name="ExoStyledControls.ButtonText">
|
|
||||||
<item name="android:textStyle">bold</item>
|
<item name="android:textStyle">bold</item>
|
||||||
<item name="android:textSize">@dimen/exo_icon_text_size</item>
|
<item name="android:textSize">@dimen/exo_icon_text_size</item>
|
||||||
<item name="android:textColor">@color/exo_white</item>
|
<item name="android:textColor">@color/exo_white</item>
|
||||||
|
<!-- Needed for https://github.com/google/ExoPlayer/issues/7898 -->
|
||||||
|
<item name="backgroundTint">@color/exo_white</item>
|
||||||
|
<item name="android:insetBottom">0dp</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="ExoStyledControls.TimeText">
|
<style name="ExoStyledControls.TimeText">
|
||||||
|
Loading…
x
Reference in New Issue
Block a user