From f6453bc32fe93e0b526402e136285a5a6dfa5a23 Mon Sep 17 00:00:00 2001 From: Caitlin Cassidy Date: Mon, 11 Apr 2022 22:11:20 +0000 Subject: [PATCH] [Media Recs] Add titles and subtitles to the expanded layout. Bug: 223603970 Test: manual (see bug for screenshot) Test: atest MediaControlPanelTest Change-Id: Iba43aee9405a60d78d00c8945860547713adf274 --- .../media_smartspace_recommendations.xml | 67 +++++++++- packages/SystemUI/res/values/dimens.xml | 3 +- packages/SystemUI/res/values/styles.xml | 20 ++- .../xml/media_recommendation_collapsed.xml | 75 ++++++++++- .../systemui/media/MediaControlPanel.java | 18 +++ .../media/RecommendationViewHolder.kt | 16 ++- .../systemui/media/MediaControlPanelTest.kt | 122 +++++++++++++++--- 7 files changed, 295 insertions(+), 26 deletions(-) diff --git a/packages/SystemUI/res/layout/media_smartspace_recommendations.xml b/packages/SystemUI/res/layout/media_smartspace_recommendations.xml index 3c3bc63906f0c..6611c59651fc3 100644 --- a/packages/SystemUI/res/layout/media_smartspace_recommendations.xml +++ b/packages/SystemUI/res/layout/media_smartspace_recommendations.xml @@ -42,10 +42,10 @@ android:id="@+id/media_cover1_container" style="@style/MediaPlayer.Recommendation.AlbumContainer" app:layout_constraintTop_toTopOf="parent" - app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintBottom_toTopOf="@+id/media_title1" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@id/media_cover2_container" - android:layout_marginEnd="@dimen/qs_media_rec_album_margin" + android:layout_marginEnd="@dimen/qs_media_rec_album_side_margin" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintHorizontal_bias="1.0" app:layout_constraintVertical_bias="0.5" @@ -63,16 +63,33 @@ android:scaleType="centerCrop"/> - + + + + + + + + + + + 88dp - 16dp + 16dp + 8dp 24dp diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index fc127cc08021c..827631b7eb531 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -672,13 +672,31 @@ @dimen/qs_media_rec_album_size @drawable/qs_media_light_source @dimen/qs_media_padding - @dimen/qs_media_padding + @dimen/qs_media_rec_album_bottom_margin + + + + + + +