From 0c5e9bb0f93e8a096c593f2b2da31387109b66bd Mon Sep 17 00:00:00 2001
From: Michael Mikhail <michaelmikhil@google.com>
Date: Wed, 12 Feb 2025 15:15:53 +0000
Subject: Add space between action buttons and song name

Flag: com.android.systemui.media_controls_ui_update
Fixes: 395940287
Test: Checked UI
Change-Id: Id2829d3548053b5df951aac2f25337c998946c56
---
 packages/SystemUI/res/layout/media_session_view.xml            |  2 +-
 packages/SystemUI/res/values/dimens.xml                        |  3 ++-
 packages/SystemUI/res/xml/media_session_collapsed.xml          |  7 +++++++
 .../media/controls/ui/controller/MediaViewController.kt        | 10 ++++++++--
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/packages/SystemUI/res/layout/media_session_view.xml b/packages/SystemUI/res/layout/media_session_view.xml
index 109e63c6167a..4472373f99a6 100644
--- a/packages/SystemUI/res/layout/media_session_view.xml
+++ b/packages/SystemUI/res/layout/media_session_view.xml
@@ -93,7 +93,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:orientation="vertical"
-        app:layout_constraintGuide_end="@dimen/qs_media_session_collapsed_guideline" />
+        app:layout_constraintGuide_end="@dimen/qs_media_session_collapsed_legacy_guideline" />
 
     <!-- App icon -->
     <com.android.internal.widget.CachingIconView
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index 2c8b923f4275..a8b3d448a740 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -1307,7 +1307,8 @@
     <dimen name="qs_media_seekbar_progress_amplitude">1.5dp</dimen>
     <dimen name="qs_media_seekbar_progress_phase">8dp</dimen>
     <dimen name="qs_media_seekbar_progress_stroke_width">2dp</dimen>
-    <dimen name="qs_media_session_collapsed_guideline">144dp</dimen>
+    <dimen name="qs_media_session_collapsed_legacy_guideline">144dp</dimen>
+    <dimen name="qs_media_session_collapsed_guideline">168dp</dimen>
 
     <!-- Size of Smartspace media recommendations cards in the QSPanel carousel -->
     <dimen name="qs_media_rec_default_width">380dp</dimen>
diff --git a/packages/SystemUI/res/xml/media_session_collapsed.xml b/packages/SystemUI/res/xml/media_session_collapsed.xml
index 66c54a389c8e..b5efd04eeba9 100644
--- a/packages/SystemUI/res/xml/media_session_collapsed.xml
+++ b/packages/SystemUI/res/xml/media_session_collapsed.xml
@@ -63,6 +63,13 @@
         app:layout_constraintTop_toTopOf="@+id/album_art"
         app:layout_constraintBottom_toBottomOf="@+id/album_art" />
 
+    <Constraint
+        android:id="@+id/action_button_guideline"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:orientation="vertical"
+        app:layout_constraintGuide_end="@dimen/qs_media_session_collapsed_legacy_guideline" />
+
     <Constraint
         android:id="@+id/header_title"
         android:layout_width="0dp"
diff --git a/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaViewController.kt b/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaViewController.kt
index c1778119a3fd..2b36872dbe36 100644
--- a/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaViewController.kt
+++ b/packages/SystemUI/src/com/android/systemui/media/controls/ui/controller/MediaViewController.kt
@@ -1040,13 +1040,19 @@ constructor(
                 expandedLayout.load(context, R.xml.media_recommendations_expanded)
             }
         }
-        readjustPlayPauseWidth()
+        readjustUIUpdateConstraints()
         refreshState()
     }
 
-    private fun readjustPlayPauseWidth() {
+    private fun readjustUIUpdateConstraints() {
         // TODO: move to xml file when flag is removed.
         if (Flags.mediaControlsUiUpdate()) {
+            collapsedLayout.setGuidelineEnd(
+                R.id.action_button_guideline,
+                context.resources.getDimensionPixelSize(
+                    R.dimen.qs_media_session_collapsed_guideline
+                ),
+            )
             collapsedLayout.constrainWidth(
                 R.id.actionPlayPause,
                 context.resources.getDimensionPixelSize(R.dimen.qs_media_action_play_pause_width),
-- 
cgit v1.2.3-59-g8ed1b