From 1e315e47d642a61a8bd33f993bab1418a91ab1b0 Mon Sep 17 00:00:00 2001
From: insun <insun@google.com>
Date: Thu, 8 Oct 2020 09:58:11 +0100
Subject: [PATCH] Expand bottom button's height and extend greyed background
 area to seekbar

Adjusted the bottom layout of StyledPlayerControlView :
- Enlarged bottom button's height to make tapping easier.
- Extended greyed background area to upper edge of seekbar.
- Gave padding between bottom edge of the overall layout and bottom buttons.
- Reduced horizontal margins between bottom buttons.

PiperOrigin-RevId: 336041160
---
 RELEASENOTES.md                                  | 16 ++++++++++------
 .../layout/exo_styled_player_control_view.xml    |  3 ++-
 library/ui/src/main/res/values/dimens.xml        | 15 +++++++++------
 library/ui/src/main/res/values/styles.xml        | 10 ++++++----
 4 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 1f1bb38b99..c31a803c5e 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -15,6 +15,16 @@
         ([#7985](https://github.com/google/ExoPlayer/issues/7985)).
     *   Fix NPE in `TextRenderer` when playing content with a single subtitle
         buffer ([#8017](https://github.com/google/ExoPlayer/issues/8017)).
+*   UI:
+    *   Do not require subtitleButton in custom layouts of StyledPlayerView
+        ([#7962](https://github.com/google/ExoPlayer/issues/7962)).
+    *   Add the option to sort tracks by `Format` in `TrackSelectionView` and
+        `TrackSelectionDialogBuilder`
+        ([#7709](https://github.com/google/ExoPlayer/issues/7709)).
+    *   Adjusted bottom buttons' heights and paddings in StyledPlayerView for
+        easy tapping.
+    *   Show overflow button in `StyledPlayerControlView` only when there is no
+        enough space.
 *   Audio:
     *   Fix the default audio sink position not advancing correctly when using
         `AudioTrack`-based speed adjustment
@@ -31,12 +41,6 @@
         ([#7988](https://github.com/google/ExoPlayer/issues/7988)).
     *   Ignore negative payload size in PES packets
         ([#8005](https://github.com/google/ExoPlayer/issues/8005)).
-*   UI
-    *   Do not require subtitleButton in custom layouts of StyledPlayerView
-        ([#7962](https://github.com/google/ExoPlayer/issues/7962)).
-    *   Add the option to sort tracks by `Format` in `TrackSelectionView` and
-        `TrackSelectionDialogBuilder`
-        ([#7709](https://github.com/google/ExoPlayer/issues/7709)).
 *   HLS:
     *   Fix crash affecting chunkful preparation of master playlists that start
         with an I-FRAME only variant
diff --git a/library/ui/src/main/res/layout/exo_styled_player_control_view.xml b/library/ui/src/main/res/layout/exo_styled_player_control_view.xml
index 3136f9d811..3fb8b98ce5 100644
--- a/library/ui/src/main/res/layout/exo_styled_player_control_view.xml
+++ b/library/ui/src/main/res/layout/exo_styled_player_control_view.xml
@@ -40,11 +40,12 @@
       android:layout_height="@dimen/exo_bottom_bar_height"
       android:layout_gravity="bottom"
       android:background="@color/exo_bottom_bar_background"
+      android:paddingBottom="@dimen/exo_bottom_bar_padding_bottom"
       android:layoutDirection="ltr">
 
     <LinearLayout android:id="@+id/exo_time"
         android:layout_width="@dimen/exo_time_view_width"
-        android:layout_height="@dimen/exo_bottom_bar_height"
+        android:layout_height="@dimen/exo_small_icon_height"
         android:paddingStart="@dimen/exo_time_view_padding"
         android:paddingEnd="@dimen/exo_time_view_padding"
         android:paddingLeft="@dimen/exo_time_view_padding"
diff --git a/library/ui/src/main/res/values/dimens.xml b/library/ui/src/main/res/values/dimens.xml
index 65f107602e..d9af3819f9 100644
--- a/library/ui/src/main/res/values/dimens.xml
+++ b/library/ui/src/main/res/values/dimens.xml
@@ -24,24 +24,27 @@
     <dimen name="exo_settings_offset">8dp</dimen>
 
     <dimen name="exo_icon_size">52dp</dimen>
-    <dimen name="exo_icon_margin">5dp</dimen>
+    <dimen name="exo_icon_horizontal_margin">5dp</dimen>
     <dimen name="exo_icon_padding">2dp</dimen>
     <dimen name="exo_icon_text_size">9dp</dimen>
     <dimen name="exo_icon_padding_bottom">18dp</dimen>
 
-    <dimen name="exo_small_button_width">48dp</dimen>
-    <dimen name="exo_small_button_height">32dp</dimen>
+    <dimen name="exo_small_icon_width">48dp</dimen>
+    <dimen name="exo_small_icon_height">48dp</dimen>
+    <dimen name="exo_small_icon_horizontal_margin">2dp</dimen>
     <dimen name="exo_small_icon_padding_horizontal">12dp</dimen>
-    <dimen name="exo_small_icon_padding_vertical">4dp</dimen>
+    <dimen name="exo_small_icon_padding_vertical">12dp</dimen>
 
     <dimen name="exo_custom_progress_max_size">2dp</dimen>
     <dimen name="exo_custom_progress_thumb_size">24dp</dimen>
-    <dimen name="exo_custom_progress_margin_bottom">40dp</dimen>
+    <dimen name="exo_custom_progress_margin_bottom">56dp</dimen>
 
-    <dimen name="exo_bottom_bar_height">32dp</dimen>
+    <dimen name="exo_bottom_bar_height">70dp</dimen>
+    <dimen name="exo_bottom_bar_padding_bottom">4dp</dimen>
 
     <dimen name="exo_time_view_padding">10dp</dimen>
     <dimen name="exo_time_view_width">170sp</dimen>
+    <dimen name="exo_time_view_height">48dp</dimen>
 
     <dimen name="exo_error_message_height">32dp</dimen>
     <dimen name="exo_error_message_margin_bottom">64dp</dimen>
diff --git a/library/ui/src/main/res/values/styles.xml b/library/ui/src/main/res/values/styles.xml
index d86c3e5a39..03afddfdc5 100644
--- a/library/ui/src/main/res/values/styles.xml
+++ b/library/ui/src/main/res/values/styles.xml
@@ -61,8 +61,8 @@
   <style name="ExoStyledControls.Button">
     <item name="android:background">?android:attr/selectableItemBackground</item>
     <item name="android:scaleType">fitXY</item>
-    <item name="android:layout_marginLeft">@dimen/exo_icon_margin</item>
-    <item name="android:layout_marginRight">@dimen/exo_icon_margin</item>
+    <item name="android:layout_marginLeft">@dimen/exo_icon_horizontal_margin</item>
+    <item name="android:layout_marginRight">@dimen/exo_icon_horizontal_margin</item>
   </style>
 
   <style name="ExoStyledControls.Button.Center">
@@ -135,8 +135,10 @@
 
   <style name="ExoStyledControls.Button.Bottom">
     <item name="android:gravity">center_horizontal</item>
-    <item name="android:layout_width">@dimen/exo_small_button_width</item>
-    <item name="android:layout_height">@dimen/exo_small_button_height</item>
+    <item name="android:layout_width">@dimen/exo_small_icon_width</item>
+    <item name="android:layout_height">@dimen/exo_small_icon_height</item>
+    <item name="android:layout_marginLeft">@dimen/exo_small_icon_horizontal_margin</item>
+    <item name="android:layout_marginRight">@dimen/exo_small_icon_horizontal_margin</item>
     <item name="android:paddingLeft">@dimen/exo_small_icon_padding_horizontal</item>
     <item name="android:paddingRight">@dimen/exo_small_icon_padding_horizontal</item>
     <item name="android:paddingTop">@dimen/exo_small_icon_padding_vertical</item>