From b68173aae4fc1754394540fa4df8197260d97666 Mon Sep 17 00:00:00 2001
From: Copybara-Service <copybara-worker@google.com>
Date: Thu, 21 Dec 2023 08:48:24 -0800
Subject: [PATCH] Merge pull request #914 from cemrich:366-forward-time-wrong

PiperOrigin-RevId: 592871532
(cherry picked from commit 966b5178b663645aa6b66594e272faa807f6bb83)
---
 RELEASENOTES.md                             | 3 +++
 libraries/ui/src/main/res/values/styles.xml | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 4b834093de..2c31df3506 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -64,6 +64,9 @@
     *   Fix issue where forward and rewind buttons are not visible when used
         with Material Design in a BottomSheetDialogFragment
         ([#511](https://github.com/androidx/media/issues/511)).
+    *   Fix issue where the numbers in the fast forward button of the
+        `PlayerControlView` were misaligned
+        ([#547](https://github.com/androidx/media/issues/547)).
 *   Downloads:
 *   OkHttp Extension:
 *   Cronet Extension:
diff --git a/libraries/ui/src/main/res/values/styles.xml b/libraries/ui/src/main/res/values/styles.xml
index 2e5e080caa..63625553a6 100644
--- a/libraries/ui/src/main/res/values/styles.xml
+++ b/libraries/ui/src/main/res/values/styles.xml
@@ -50,6 +50,8 @@
   <style name="ExoStyledControls.Button.Center.FfwdWithAmount">
     <item name="android:foreground">@drawable/exo_styled_controls_fastforward</item>
     <item name="android:gravity">center|bottom</item>
+    <item name="android:paddingRight">0dp</item>
+    <item name="android:paddingLeft">0dp</item>
     <item name="android:paddingBottom">@dimen/exo_icon_padding_bottom</item>
     <item name="android:textStyle">bold</item>
     <item name="android:textSize">@dimen/exo_icon_text_size</item>
@@ -62,6 +64,8 @@
   <style name="ExoStyledControls.Button.Center.RewWithAmount">
     <item name="android:foreground">@drawable/exo_styled_controls_rewind</item>
     <item name="android:gravity">center|bottom</item>
+    <item name="android:paddingRight">0dp</item>
+    <item name="android:paddingLeft">0dp</item>
     <item name="android:paddingBottom">@dimen/exo_icon_padding_bottom</item>
     <item name="android:textStyle">bold</item>
     <item name="android:textSize">@dimen/exo_icon_text_size</item>