loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix FFWD/RWND color in night mode

Browse Source 
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:
olly 2021-12-08 12:40:10 +00:00 committed by Ian Baker
parent 1218f56db6
commit bc1e5868d6
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libraries/ui/src/main/res/values/styles.xml
View File

@ -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">