From c3bd487bb01df7a660a537cdf5b2237fe5f69587 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20G=C3=B6llner?= <chrisgollner@google.com>
Date: Tue, 8 Mar 2022 11:06:23 +0100
Subject: [PATCH] Media: tweak the height for split shade to match spec

- On sw620dp-land it should be 172dp
- On sw720dp-land it should be 280dp, but for now leaving it as it was.

Bug: 221823467
Test: Manually
Change-Id: Ifea6cb5cfde8d4d6802670bf54cffdea12d743f4
---
 packages/SystemUI/res/layout/media_session_view.xml  | 2 +-
 packages/SystemUI/res/values-sw600dp-land/dimens.xml | 2 ++
 packages/SystemUI/res/values-sw720dp-land/dimens.xml | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/res/layout/media_session_view.xml b/packages/SystemUI/res/layout/media_session_view.xml
index 978998d6ca2c7..9ad01528686ee 100644
--- a/packages/SystemUI/res/layout/media_session_view.xml
+++ b/packages/SystemUI/res/layout/media_session_view.xml
@@ -139,7 +139,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/qs_media_padding"
         app:layout_constrainedWidth="true"
-        android:layout_marginTop="1dp"
+        android:layout_marginTop="0dp"
         app:layout_constraintTop_toBottomOf="@id/header_title"
         app:layout_constraintStart_toStartOf="@id/header_title"
         app:layout_constraintEnd_toStartOf="@id/actionPlayPause"
diff --git a/packages/SystemUI/res/values-sw600dp-land/dimens.xml b/packages/SystemUI/res/values-sw600dp-land/dimens.xml
index 117404bad46e6..2b4927cfc5743 100644
--- a/packages/SystemUI/res/values-sw600dp-land/dimens.xml
+++ b/packages/SystemUI/res/values-sw600dp-land/dimens.xml
@@ -22,6 +22,8 @@
     <dimen name="ambient_indication_margin_bottom">115dp</dimen>
     <dimen name="lock_icon_margin_bottom">60dp</dimen>
 
+    <dimen name="qs_media_session_height_expanded">172dp</dimen>
+
     <!-- margin from keyguard status bar to clock. For split shade it should be
          keyguard_split_shade_top_margin - status_bar_header_height_keyguard = 8dp -->
     <dimen name="keyguard_clock_top_margin">8dp</dimen>
diff --git a/packages/SystemUI/res/values-sw720dp-land/dimens.xml b/packages/SystemUI/res/values-sw720dp-land/dimens.xml
index 139146181a479..e57dbf0371e3f 100644
--- a/packages/SystemUI/res/values-sw720dp-land/dimens.xml
+++ b/packages/SystemUI/res/values-sw720dp-land/dimens.xml
@@ -26,4 +26,6 @@
     <dimen name="notification_panel_margin_horizontal">24dp</dimen>
 
     <dimen name="split_shade_header_height">56dp</dimen>
+
+    <dimen name="qs_media_session_height_expanded">184dp</dimen>
 </resources>