From 34d64788a1a971ff4fce38487db8c8e3be06a2c1 Mon Sep 17 00:00:00 2001
From: Beth Thibodeau <ethibodeau@google.com>
Date: Thu, 6 May 2021 20:55:23 -0400
Subject: [PATCH] Adjust size of action buttons

Increase height to 56dp in compact mode, and scale icons down to 24dp

Bug: 187421292
Test: visual
Change-Id: If5e691a77ae03634eb7574eb383d5a31736c26ee
---
 packages/SystemUI/res/layout/media_view.xml   |  2 +-
 packages/SystemUI/res/values/styles.xml       |  2 ++
 packages/SystemUI/res/xml/media_collapsed.xml | 18 +++++-------------
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/packages/SystemUI/res/layout/media_view.xml b/packages/SystemUI/res/layout/media_view.xml
index e9a24e2846011..8dbbd4a4a66f2 100644
--- a/packages/SystemUI/res/layout/media_view.xml
+++ b/packages/SystemUI/res/layout/media_view.xml
@@ -40,7 +40,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.5" />
+        app:layout_constraintGuide_begin="48dp" />
 
     <!-- As per Material Design on Biderectionality, this is forced to LTR in code -->
     <FrameLayout
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index 7db9decbe78a7..475547f73e8fd 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -639,6 +639,8 @@
         <item name="android:background">@drawable/qs_media_light_source</item>
         <item name="android:tint">?android:attr/textColorPrimary</item>
         <item name="android:stateListAnimator">@anim/media_button_state_list_animator</item>
+        <item name="android:padding">12dp</item>
+        <item name="android:scaleType">fitCenter</item>
     </style>
 
     <style name="MediaPlayer.OutlineButton">
diff --git a/packages/SystemUI/res/xml/media_collapsed.xml b/packages/SystemUI/res/xml/media_collapsed.xml
index 9bd462e66e3b7..bdb8c049b8614 100644
--- a/packages/SystemUI/res/xml/media_collapsed.xml
+++ b/packages/SystemUI/res/xml/media_collapsed.xml
@@ -40,10 +40,7 @@
         app:layout_constrainedWidth="true"
         app:layout_constraintWidth_min="48dp"
         app:layout_constraintHeight_min="48dp"
-        android:paddingTop="@dimen/qs_media_padding"
-        android:paddingEnd="@dimen/qs_media_padding"
         android:layout_marginStart="@dimen/qs_center_guideline_padding"
-        android:layout_marginBottom="4dp"
         />
 
     <Constraint
@@ -125,10 +122,9 @@
     <Constraint
         android:id="@+id/action0"
         android:layout_width="48dp"
-        android:layout_height="48dp"
+        android:layout_height="56dp"
         android:layout_marginStart="@dimen/qs_media_padding"
         android:layout_marginEnd="@dimen/qs_media_action_spacing"
-        android:layout_marginTop="@dimen/qs_media_action_spacing"
         android:visibility="gone"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintTop_toBottomOf="@id/center_horizontal_guideline"
@@ -142,10 +138,9 @@
     <Constraint
         android:id="@+id/action1"
         android:layout_width="48dp"
-        android:layout_height="48dp"
+        android:layout_height="56dp"
         android:layout_marginStart="@dimen/qs_media_action_spacing"
         android:layout_marginEnd="@dimen/qs_media_action_spacing"
-        android:layout_marginTop="@dimen/qs_media_action_spacing"
         app:layout_constraintTop_toBottomOf="@id/center_horizontal_guideline"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toRightOf="@id/action0"
@@ -156,10 +151,9 @@
     <Constraint
         android:id="@+id/action2"
         android:layout_width="48dp"
-        android:layout_height="48dp"
+        android:layout_height="56dp"
         android:layout_marginStart="@dimen/qs_media_action_spacing"
         android:layout_marginEnd="@dimen/qs_media_action_spacing"
-        android:layout_marginTop="@dimen/qs_media_action_spacing"
         app:layout_constraintTop_toBottomOf="@id/center_horizontal_guideline"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toRightOf="@id/action1"
@@ -170,10 +164,9 @@
     <Constraint
         android:id="@+id/action3"
         android:layout_width="48dp"
-        android:layout_height="48dp"
+        android:layout_height="56dp"
         android:layout_marginStart="@dimen/qs_media_action_spacing"
         android:layout_marginEnd="@dimen/qs_media_action_spacing"
-        android:layout_marginTop="@dimen/qs_media_action_spacing"
         app:layout_constraintTop_toBottomOf="@id/center_horizontal_guideline"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toRightOf="@id/action2"
@@ -184,11 +177,10 @@
     <Constraint
         android:id="@+id/action4"
         android:layout_width="48dp"
-        android:layout_height="48dp"
+        android:layout_height="56dp"
         android:layout_marginStart="@dimen/qs_media_action_spacing"
         android:layout_marginEnd="@dimen/qs_media_padding"
         android:visibility="gone"
-        android:layout_marginTop="@dimen/qs_media_action_spacing"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintTop_toBottomOf="@id/center_horizontal_guideline"
         app:layout_constraintBottom_toBottomOf="parent"