From bc1e5868d64c57f7543d8bf6119864d1a33ddca0 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 8 Dec 2021 12:40:10 +0000
Subject: [PATCH] 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
---
 libraries/ui/src/main/res/values/styles.xml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/libraries/ui/src/main/res/values/styles.xml b/libraries/ui/src/main/res/values/styles.xml
index 84f2db543d..66efb3eee6 100644
--- a/libraries/ui/src/main/res/values/styles.xml
+++ b/libraries/ui/src/main/res/values/styles.xml
@@ -92,9 +92,11 @@
     <item name="android:foreground">@drawable/exo_styled_controls_fastforward</item>
     <item name="android:gravity">center|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 -->
-    <item name="backgroundTint">@android:color/white</item>
+    <item name="backgroundTint">@color/exo_white</item>
     <item name="android:insetBottom">0dp</item>
   </style>
 
@@ -102,16 +104,12 @@
     <item name="android:foreground">@drawable/exo_styled_controls_rewind</item>
     <item name="android:gravity">center|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:textSize">@dimen/exo_icon_text_size</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 name="ExoStyledControls.TimeText">