Fix fastforward and rewind color tinting and text alignment

Issue: #7898 PiperOrigin-RevId: 343251455
google · Nov 23, 2020 · 3509f50 · 3509f50
1 parent 78d6581
commit 3509f50
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -9,6 +9,10 @@
     *   Suppress ProGuard warnings caused by Guava's compile-only dependencies
         ([#8103](https://github.com/google/ExoPlayer/issues/8103)).
 *   UI:
+    *   Fix incorrect color and text alignment of the `StyledPlayerControlView`
+        fast forward and rewind buttons, when used together with the
+        `com.google.android.material` library
+        ([#7898](https://github.com/google/ExoPlayer/issues/7898)).
     *   Add `dispatchPrepare(Player)` to `ControlDispatcher` and implement it in
         `DefaultControlDispatcher`. Deprecate `PlaybackPreparer` and
         `setPlaybackPreparer` in `StyledPlayerView`, `StyledPlayerControlView`,

diff --git a/library/ui/src/main/res/values/attrs.xml b/library/ui/src/main/res/values/attrs.xml
@@ -72,6 +72,9 @@
   <attr name="controller_layout_id" format="reference"/>
   <attr name="animation_enabled" format="boolean"/>
 
+  <!-- Needed for https://github.com/google/ExoPlayer/issues/7898 -->
+  <attr name="backgroundTint" format="color"/>
+
   <!-- DefaultTimeBar attributes -->
   <attr name="bar_height" format="dimension"/>
   <attr name="bar_gravity" format="enum">

diff --git a/library/ui/src/main/res/values/styles.xml b/library/ui/src/main/res/values/styles.xml
@@ -93,12 +93,19 @@
     <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.Button.Center.RewWithAmount">
     <item name="android:background">@drawable/exo_ripple_rew</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">