Merge "[Media Recs] Some updates to smartspace recommendations layout: - Only... (4a93e580) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/media_smartspace_recommendations.xml

+40 −113

Original line number	Diff line number	Diff line
		@@ -22,160 +22,87 @@
		android:id="@+id/media_recommendations"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingStart="@dimen/qs_media_padding"
		android:paddingEnd="@dimen/qs_media_padding"
		android:clipChildren="false"
		android:clipToPadding="false"
		android:forceHasOverlappingRendering="false"
		android:background="@drawable/qs_media_background"
		android:theme="@style/MediaPlayer">

		<androidx.constraintlayout.widget.Guideline
		android:id="@+id/media_vertical_start_guideline"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		app:layout_constraintGuide_percent="0.25" />

		<androidx.constraintlayout.widget.Guideline
		android:id="@+id/media_horizontal_center_guideline"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		app:layout_constraintGuide_percent="0.5" />
		<!-- This view just ensures the full media player is a certain height. -->
		<View
		android:id="@+id/sizing_view"
		android:layout_width="match_parent"
		android:layout_height="@dimen/qs_media_session_height_expanded" />

		<com.android.internal.widget.CachingIconView
		android:id="@+id/recommendation_card_icon"
		android:layout_width="@dimen/qs_media_icon_size"
		android:layout_height="@dimen/qs_media_icon_size"
		android:layout_marginTop="@dimen/qs_media_padding"
		android:src="@drawable/ic_headset"
		style="@style/MediaPlayer.AppIcon"
		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintEnd_toStartOf="@id/media_vertical_start_guideline"
		app:layout_constraintHorizontal_bias="0"/>

		<TextView
		android:id="@+id/recommendation_card_text"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:maxLines="1"
		android:text="@string/controls_media_smartspace_rec_title"
		android:fontFamily="google-sans-medium"
		android:textDirection="locale"
		android:textSize="@dimen/qq_aa_media_rec_header_text_size"
		android:hyphenationFrequency="none"
		app:layout_constraintTop_toBottomOf="@id/recommendation_card_icon"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintEnd_toStartOf="@id/media_vertical_start_guideline"
		app:layout_constraintHorizontal_bias="0"/>

		<View
		android:id="@+id/recommendation_gradient_view"
		android:layout_width="@dimen/qs_aa_media_gradient_bg_width"
		android:layout_height="0dp"
		android:clipToPadding="false"
		android:clipChildren="false"
		android:background="@drawable/qs_media_recommendation_bg_gradient"
		app:layout_constraintTop_toTopOf="@id/recommendation_card_text"
		app:layout_constraintBottom_toBottomOf="@id/recommendation_card_text"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintEnd_toStartOf="@id/media_vertical_start_guideline"
		app:layout_constraintHorizontal_bias="1"/>
		style="@style/MediaPlayer.Recommendation.AppIcon" />

		<FrameLayout
		android:id="@+id/media_cover1_container"
		android:layout_width="0dp"
		android:layout_height="@dimen/qs_aa_media_rec_album_size_collapsed"
		android:background="@drawable/qs_media_light_source">
		style="@style/MediaPlayer.Recommendation.AlbumContainer"
		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintStart_toStartOf="parent"
		app:layout_constraintEnd_toStartOf="@id/media_cover2_container"
		android:layout_marginEnd="@dimen/qs_media_rec_album_margin"
		app:layout_constraintHorizontal_chainStyle="packed"
		app:layout_constraintHorizontal_bias="1.0"
		app:layout_constraintVertical_bias="0.5"
		>
		<ImageView
		android:id="@+id/media_cover1"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintBottom_toBottomOf="parent"
		android:adjustViewBounds="true"
		android:background="@drawable/bg_smartspace_media_item"
		style="@style/MediaPlayer.Album"
		style="@style/MediaPlayer.Recommendation.Album"
		android:clipToOutline="true"
		android:scaleType="centerCrop"/>
		</FrameLayout>

		<!-- TODO(b/223603970): Add title and subtitle below each album cover. -->

		<FrameLayout
		android:id="@+id/media_cover2_container"
		android:layout_width="0dp"
		android:layout_height="@dimen/qs_aa_media_rec_album_size_collapsed"
		android:background="@drawable/qs_media_light_source">
		style="@style/MediaPlayer.Recommendation.AlbumContainer"
		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintStart_toEndOf="@id/media_cover1_container"
		app:layout_constraintEnd_toStartOf="@id/media_cover3_container"
		android:layout_marginEnd="@dimen/qs_media_rec_album_margin"
		app:layout_constraintVertical_bias="0.5"
		>
		<ImageView
		android:id="@+id/media_cover2"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:adjustViewBounds="true"
		android:background="@drawable/bg_smartspace_media_item"
		style="@style/MediaPlayer.Album"
		style="@style/MediaPlayer.Recommendation.Album"
		android:clipToOutline="true"
		android:scaleType="centerCrop"/>
		</FrameLayout>

		<FrameLayout
		android:id="@+id/media_cover3_container"
		android:layout_width="0dp"
		android:layout_height="@dimen/qs_aa_media_rec_album_size_collapsed"
		android:background="@drawable/qs_media_light_source">
		style="@style/MediaPlayer.Recommendation.AlbumContainer"
		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintStart_toEndOf="@id/media_cover2_container"
		app:layout_constraintEnd_toEndOf="parent"
		android:layout_marginEnd="@dimen/qs_media_padding"
		app:layout_constraintVertical_bias="0.5"
		>
		<ImageView
		android:id="@+id/media_cover3"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:adjustViewBounds="true"
		android:background="@drawable/bg_smartspace_media_item"
		style="@style/MediaPlayer.Album"
		android:clipToOutline="true"
		android:scaleType="centerCrop"/>
		</FrameLayout>

		<FrameLayout
		android:id="@+id/media_cover4_container"
		android:layout_width="0dp"
		android:layout_height="@dimen/qs_aa_media_rec_album_size_collapsed"
		android:background="@drawable/qs_media_light_source">
		<ImageView
		android:id="@+id/media_cover4"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:adjustViewBounds="true"
		android:background="@drawable/bg_smartspace_media_item"
		style="@style/MediaPlayer.Album"
		android:clipToOutline="true"
		android:scaleType="centerCrop"/>
		</FrameLayout>

		<FrameLayout
		android:id="@+id/media_cover5_container"
		android:layout_width="0dp"
		android:layout_height="@dimen/qs_aa_media_rec_album_size_collapsed"
		android:background="@drawable/qs_media_light_source">
		<ImageView
		android:id="@+id/media_cover5"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:adjustViewBounds="true"
		android:background="@drawable/bg_smartspace_media_item"
		style="@style/MediaPlayer.Album"
		android:clipToOutline="true"
		android:scaleType="centerCrop"/>
		</FrameLayout>

		<FrameLayout
		android:id="@+id/media_cover6_container"
		android:layout_width="0dp"
		android:layout_height="@dimen/qs_aa_media_rec_album_size_collapsed"
		android:background="@drawable/qs_media_light_source">
		<ImageView
		android:id="@+id/media_cover6"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:adjustViewBounds="true"
		android:background="@drawable/bg_smartspace_media_item"
		style="@style/MediaPlayer.Album"
		style="@style/MediaPlayer.Recommendation.Album"
		android:clipToOutline="true"
		android:scaleType="centerCrop"/>
		</FrameLayout>

packages/SystemUI/res/values/dimens.xml

+3 −7

Original line number	Diff line number	Diff line
		@@ -959,7 +959,6 @@
		<dimen name="qs_media_album_radius">14dp</dimen>
		<dimen name="qs_media_info_margin">12dp</dimen>
		<dimen name="qs_media_info_spacing">8dp</dimen>
		<dimen name="qs_media_icon_size">20dp</dimen>
		<dimen name="qs_media_icon_offset">4dp</dimen>
		<dimen name="qs_center_guideline_padding">10dp</dimen>
		<dimen name="qs_media_action_spacing">4dp</dimen>
		@@ -980,12 +979,9 @@
		<dimen name="qs_media_session_collapsed_guideline">144dp</dimen>

		<!-- Size of Smartspace media recommendations cards in the QSPanel carousel -->
		<dimen name="qs_aa_media_rec_album_size_collapsed">72dp</dimen>
		<dimen name="qs_aa_media_rec_album_size_expanded">76dp</dimen>
		<dimen name="qs_aa_media_gradient_bg_width">32dp</dimen>
		<dimen name="qs_aa_media_rec_album_margin">8dp</dimen>
		<dimen name="qs_aa_media_rec_album_margin_vert">4dp</dimen>
		<dimen name="qq_aa_media_rec_header_text_size">16sp</dimen>
		<dimen name="qs_media_rec_album_size">88dp</dimen>
		<dimen name="qs_media_rec_album_margin">16dp</dimen>
		<dimen name="qs_media_rec_icon_size">24dp</dimen>

		<!-- Media tap-to-transfer chip for sender device -->
		<dimen name="media_ttt_chip_outer_padding">16dp</dimen>

packages/SystemUI/res/values/styles.xml

+19 −3

Original line number	Diff line number	Diff line
		@@ -653,13 +653,29 @@
		<item name="android:textColor">?android:attr/textColorPrimary</item>
		</style>

		<style name="MediaPlayer.AppIcon">
		<style name="MediaPlayer.Recommendation"/>

		<style name="MediaPlayer.Recommendation.AppIcon">
		<item name="android:background">@drawable/qs_media_icon_background</item>
		<item name="android:backgroundTint">@color/media_player_solid_button_bg</item>
		<item name="android:padding">4dp</item>
		<item name="android:layout_width">@dimen/qs_media_rec_icon_size</item>
		<item name="android:layout_height">@dimen/qs_media_rec_icon_size</item>
		<item name="layout_constraintTop_toTopOf">parent</item>
		<item name="layout_constraintStart_toStartOf">parent</item>
		<item name="android:layout_marginTop">@dimen/qs_media_padding</item>
		<item name="android:layout_marginStart">@dimen/qs_media_padding</item>
		<item name="android:src">@drawable/ic_headset</item>
		</style>

		<style name="MediaPlayer.Recommendation.AlbumContainer">
		<item name="android:layout_width">@dimen/qs_media_rec_album_size</item>
		<item name="android:layout_height">@dimen/qs_media_rec_album_size</item>
		<item name="android:background">@drawable/qs_media_light_source</item>
		<item name="android:layout_marginTop">@dimen/qs_media_padding</item>
		<item name="android:layout_marginBottom">@dimen/qs_media_padding</item>
		</style>

		<style name="MediaPlayer.Album">
		<style name="MediaPlayer.Recommendation.Album">
		<item name="android:backgroundTint">@color/media_player_album_bg</item>
		</style>

packages/SystemUI/res/xml/media_recommendation_collapsed.xml

+5 −85

Original line number	Diff line number	Diff line
		@@ -15,92 +15,12 @@
		~ limitations under the License
		-->
		<ConstraintSet
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:app="http://schemas.android.com/apk/res-auto">
		xmlns:android="http://schemas.android.com/apk/res/android" >

		<Constraint
		android:id="@+id/media_cover1_container"
		android:layout_width="0dp"
		android:layout_height="@dimen/qs_aa_media_rec_album_size_collapsed"
		app:layout_constraintWidth_max="@dimen/qs_aa_media_rec_album_size_collapsed"
		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintBottom_toBottomOf="parent"
		android:layout_marginTop="@dimen/qs_media_padding"
		android:layout_marginBottom="@dimen/qs_media_padding"
		android:layout_marginEnd="@dimen/qs_aa_media_rec_album_margin"
		app:layout_constraintStart_toEndOf="@id/media_vertical_start_guideline"
		app:layout_constraintEnd_toStartOf="@id/media_cover2_container"
		app:layout_constraintHorizontal_chainStyle="packed"
		app:layout_constraintHorizontal_bias="1"
		android:visibility="gone" />

		<Constraint
		android:id="@+id/media_cover2_container"
		android:layout_width="0dp"
		android:layout_height="@dimen/qs_aa_media_rec_album_size_collapsed"
		app:layout_constraintWidth_max="@dimen/qs_aa_media_rec_album_size_collapsed"
		android:layout_marginTop="@dimen/qs_media_padding"
		android:layout_marginBottom="@dimen/qs_media_padding"
		android:layout_marginEnd="@dimen/qs_aa_media_rec_album_margin"
		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintStart_toEndOf="@id/media_cover1_container"
		app:layout_constraintEnd_toStartOf="@id/media_cover3_container"
		app:layout_constraintHorizontal_chainStyle="packed"
		app:layout_constraintHorizontal_bias="1"
		android:visibility="gone" />

		<Constraint
		android:id="@+id/media_cover3_container"
		android:layout_width="0dp"
		android:layout_height="@dimen/qs_aa_media_rec_album_size_collapsed"
		app:layout_constraintWidth_max="@dimen/qs_aa_media_rec_album_size_collapsed"
		android:layout_marginTop="@dimen/qs_media_padding"
		android:layout_marginBottom="@dimen/qs_media_padding"
		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintStart_toEndOf="@id/media_cover2_container"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintHorizontal_chainStyle="packed"
		app:layout_constraintHorizontal_bias="1"
		android:visibility="gone" />

		<Constraint
		android:id="@+id/media_cover4_container"
		android:layout_width="0dp"
		android:layout_height="0dp"
		android:layout_marginEnd="@dimen/qs_aa_media_rec_album_margin"
		app:layout_constraintTop_toBottomOf="@+id/media_cover1_container"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintStart_toEndOf="@id/media_vertical_start_guideline"
		app:layout_constraintEnd_toStartOf="@id/media_cover5_container"
		app:layout_constraintHorizontal_chainStyle="packed"
		app:layout_constraintHorizontal_bias="1"
		android:visibility="gone" />

		<Constraint
		android:id="@+id/media_cover5_container"
		android:layout_width="0dp"
		android:layout_height="0dp"
		android:layout_marginEnd="@dimen/qs_aa_media_rec_album_margin"
		app:layout_constraintTop_toBottomOf="@+id/media_cover2_container"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintStart_toEndOf="@+id/media_cover4_container"
		app:layout_constraintEnd_toStartOf="@+id/media_cover6_container"
		app:layout_constraintHorizontal_chainStyle="packed"
		app:layout_constraintHorizontal_bias="1"
		android:visibility="gone" />

		<Constraint
		android:id="@+id/media_cover6_container"
		android:layout_width="0dp"
		android:layout_height="0dp"
		app:layout_constraintTop_toBottomOf="@id/media_cover3_container"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintStart_toEndOf="@id/media_cover5_container"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintHorizontal_chainStyle="packed"
		app:layout_constraintHorizontal_bias="1"
		android:visibility="gone" />
		android:id="@+id/sizing_view"
		android:layout_width="match_parent"
		android:layout_height="@dimen/qs_media_session_height_collapsed"
		/>

		</ConstraintSet>

packages/SystemUI/res/xml/media_recommendation_expanded.xml

+5 −106

Original line number	Diff line number	Diff line
		@@ -15,113 +15,12 @@
		~ limitations under the License
		-->
		<ConstraintSet
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:app="http://schemas.android.com/apk/res-auto">
		xmlns:android="http://schemas.android.com/apk/res/android" >

		<Constraint
		android:id="@+id/media_cover1_container"
		android:layout_width="0dp"
		android:layout_height="@dimen/qs_aa_media_rec_album_size_expanded"
		app:layout_constraintWidth_max="@dimen/qs_aa_media_rec_album_size_expanded"
		android:layout_marginTop="@dimen/qs_media_padding"
		android:layout_marginBottom="@dimen/qs_aa_media_rec_album_margin_vert"
		android:layout_marginEnd="@dimen/qs_aa_media_rec_album_margin"
		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintBottom_toTopOf="@+id/media_horizontal_center_guideline"
		app:layout_constraintStart_toEndOf="@id/media_vertical_start_guideline"
		app:layout_constraintEnd_toStartOf="@id/media_cover2_container"
		app:layout_constraintHorizontal_chainStyle="packed"
		app:layout_constraintHorizontal_bias="1"
		app:layout_constraintVertical_chainStyle="packed"
		app:layout_constraintVertical_bias="0"
		android:visibility="gone" />

		<Constraint
		android:id="@+id/media_cover2_container"
		android:layout_width="0dp"
		android:layout_height="@dimen/qs_aa_media_rec_album_size_expanded"
		app:layout_constraintWidth_max="@dimen/qs_aa_media_rec_album_size_expanded"
		android:layout_marginTop="@dimen/qs_media_padding"
		android:layout_marginBottom="@dimen/qs_aa_media_rec_album_margin_vert"
		android:layout_marginEnd="@dimen/qs_aa_media_rec_album_margin"
		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintBottom_toTopOf="@+id/media_horizontal_center_guideline"
		app:layout_constraintStart_toEndOf="@id/media_cover1_container"
		app:layout_constraintEnd_toStartOf="@id/media_cover3_container"
		app:layout_constraintHorizontal_chainStyle="packed"
		app:layout_constraintHorizontal_bias="1"
		app:layout_constraintVertical_chainStyle="packed"
		app:layout_constraintVertical_bias="0"
		android:visibility="gone" />

		<Constraint
		android:id="@+id/media_cover3_container"
		android:layout_width="0dp"
		android:layout_height="@dimen/qs_aa_media_rec_album_size_expanded"
		app:layout_constraintWidth_max="@dimen/qs_aa_media_rec_album_size_expanded"
		android:layout_marginTop="@dimen/qs_media_padding"
		android:layout_marginBottom="@dimen/qs_aa_media_rec_album_margin_vert"
		app:layout_constraintTop_toTopOf="parent"
		app:layout_constraintBottom_toTopOf="@+id/media_horizontal_center_guideline"
		app:layout_constraintStart_toEndOf="@id/media_cover2_container"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintHorizontal_chainStyle="packed"
		app:layout_constraintHorizontal_bias="1"
		app:layout_constraintVertical_chainStyle="packed"
		app:layout_constraintVertical_bias="0"
		android:visibility="gone" />

		<Constraint
		android:id="@+id/media_cover4_container"
		android:layout_width="0dp"
		android:layout_height="@dimen/qs_aa_media_rec_album_size_expanded"
		app:layout_constraintWidth_max="@dimen/qs_aa_media_rec_album_size_expanded"
		android:layout_marginTop="@dimen/qs_aa_media_rec_album_margin_vert"
		android:layout_marginBottom="@dimen/qs_media_padding"
		android:layout_marginEnd="@dimen/qs_aa_media_rec_album_margin"
		app:layout_constraintTop_toBottomOf="@+id/media_horizontal_center_guideline"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintStart_toEndOf="@id/media_vertical_start_guideline"
		app:layout_constraintEnd_toStartOf="@id/media_cover5_container"
		app:layout_constraintHorizontal_chainStyle="packed"
		app:layout_constraintHorizontal_bias="1"
		app:layout_constraintVertical_chainStyle="packed"
		app:layout_constraintVertical_bias="1"
		android:visibility="gone" />

		<Constraint
		android:id="@+id/media_cover5_container"
		android:layout_width="0dp"
		android:layout_height="@dimen/qs_aa_media_rec_album_size_expanded"
		app:layout_constraintWidth_max="@dimen/qs_aa_media_rec_album_size_expanded"
		android:layout_marginTop="@dimen/qs_aa_media_rec_album_margin_vert"
		android:layout_marginBottom="@dimen/qs_media_padding"
		android:layout_marginEnd="@dimen/qs_aa_media_rec_album_margin"
		app:layout_constraintTop_toBottomOf="@+id/media_horizontal_center_guideline"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintStart_toEndOf="@+id/media_cover4_container"
		app:layout_constraintEnd_toStartOf="@+id/media_cover6_container"
		app:layout_constraintHorizontal_chainStyle="packed"
		app:layout_constraintHorizontal_bias="1"
		app:layout_constraintVertical_chainStyle="packed"
		app:layout_constraintVertical_bias="1"
		android:visibility="gone" />

		<Constraint
		android:id="@+id/media_cover6_container"
		android:layout_width="0dp"
		android:layout_height="@dimen/qs_aa_media_rec_album_size_expanded"
		app:layout_constraintWidth_max="@dimen/qs_aa_media_rec_album_size_expanded"
		android:layout_marginTop="@dimen/qs_aa_media_rec_album_margin_vert"
		android:layout_marginBottom="@dimen/qs_media_padding"
		app:layout_constraintTop_toBottomOf="@id/media_horizontal_center_guideline"
		app:layout_constraintBottom_toBottomOf="parent"
		app:layout_constraintStart_toEndOf="@id/media_cover5_container"
		app:layout_constraintEnd_toEndOf="parent"
		app:layout_constraintHorizontal_chainStyle="packed"
		app:layout_constraintHorizontal_bias="1"
		app:layout_constraintVertical_chainStyle="packed"
		app:layout_constraintVertical_bias="1"
		android:visibility="gone" />
		android:id="@+id/sizing_view"
		android:layout_width="match_parent"
		android:layout_height="@dimen/qs_media_session_height_expanded"
		/>

		</ConstraintSet>