Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update Smartspace media recommendation card appearance to match the latest mock." into sc-dev

Browse Source
This commit is contained in:
Cecilia Hong
2021-04-30 02:44:43 +00:00
committed by Android (Google) Code Review
parent 9773696596 3f2e85a9c4
commit 60cdd91176
10 changed files with 490 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
packages/SystemUI/res/layout/media_smartspace_recommendations.xml
View File

@@ -19,29 +19,57 @@
<com.android.systemui.util.animation.TransitionLayout <com.android.systemui.util.animation.TransitionLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:id="@+id/media_recommendations" android:id="@+id/media_recommendations"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="8dp" android:paddingStart="@dimen/qs_media_padding"
android:paddingBottom="8dp" android:paddingEnd="@dimen/qs_media_padding"
android:clipChildren="false" android:clipChildren="false"
android:clipToPadding="false" android:clipToPadding="false"
android:forceHasOverlappingRendering="false" android:forceHasOverlappingRendering="false"
android:background="@drawable/qs_media_background"> android:background="@drawable/qs_media_background">
<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" />
<ImageView
android:id="@+id/recommendation_card_icon"
android:layout_width="@dimen/qs_aa_media_rec_header_icon_size"
android:layout_height="@dimen/qs_aa_media_rec_header_icon_size"
android:src="@drawable/ic_headset"
android:tint="?android:attr/colorPrimary" />
<TextView
android:id="@+id/recommendation_card_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/controls_media_smartspace_rec_title"
android:fontFamily="google-sans-medium"
android:textColor="?android:attr/colorPrimary"
android:textDirection="locale"
android:textSize="@dimen/qq_aa_media_rec_header_text_size" />
<ImageView <ImageView
android:id="@+id/media_cover1" android:id="@+id/media_cover1"
android:layout_width="@dimen/qs_aa_media_rec_album_size" android:layout_width="@dimen/qs_aa_media_rec_album_size"
android:layout_height="@dimen/qs_aa_media_rec_album_size" android:layout_height="@dimen/qs_aa_media_rec_album_size"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:background="@drawable/bg_smartspace_media_item" android:background="@drawable/bg_smartspace_media_item"
android:backgroundTint="?androidprv:attr/colorAccentSecondary"
android:clipToOutline="true" android:clipToOutline="true"
android:scaleType="centerCrop"/> android:scaleType="centerCrop"/>
<ImageView <com.android.internal.widget.CachingIconView
android:id="@+id/media_logo1" android:id="@+id/media_logo1"
android:layout_width="@dimen/qs_aa_media_rec_icon_size" android:layout_width="@dimen/qs_media_icon_size"
android:layout_height="@dimen/qs_aa_media_rec_icon_size" /> android:layout_height="@dimen/qs_media_icon_size"
android:background="@drawable/qs_media_icon_background" />
<ImageView <ImageView
android:id="@+id/media_cover2" android:id="@+id/media_cover2"
@@ -49,13 +77,15 @@
android:layout_height="@dimen/qs_aa_media_rec_album_size" android:layout_height="@dimen/qs_aa_media_rec_album_size"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:background="@drawable/bg_smartspace_media_item" android:background="@drawable/bg_smartspace_media_item"
android:backgroundTint="?androidprv:attr/colorAccentSecondary"
android:clipToOutline="true" android:clipToOutline="true"
android:scaleType="centerCrop"/> android:scaleType="centerCrop"/>
<ImageView <com.android.internal.widget.CachingIconView
android:id="@+id/media_logo2" android:id="@+id/media_logo2"
android:layout_width="@dimen/qs_aa_media_rec_icon_size" android:layout_width="@dimen/qs_media_icon_size"
android:layout_height="@dimen/qs_aa_media_rec_icon_size" /> android:layout_height="@dimen/qs_media_icon_size"
android:background="@drawable/qs_media_icon_background" />
<ImageView <ImageView
android:id="@+id/media_cover3" android:id="@+id/media_cover3"
@@ -63,13 +93,15 @@
android:layout_height="@dimen/qs_aa_media_rec_album_size" android:layout_height="@dimen/qs_aa_media_rec_album_size"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:background="@drawable/bg_smartspace_media_item" android:background="@drawable/bg_smartspace_media_item"
android:backgroundTint="?androidprv:attr/colorAccentSecondary"
android:clipToOutline="true" android:clipToOutline="true"
android:scaleType="centerCrop"/> android:scaleType="centerCrop"/>
<ImageView <com.android.internal.widget.CachingIconView
android:id="@+id/media_logo3" android:id="@+id/media_logo3"
android:layout_width="@dimen/qs_aa_media_rec_icon_size" android:layout_width="@dimen/qs_media_icon_size"
android:layout_height="@dimen/qs_aa_media_rec_icon_size" /> android:layout_height="@dimen/qs_media_icon_size"
android:background="@drawable/qs_media_icon_background" />
<ImageView <ImageView
android:id="@+id/media_cover4" android:id="@+id/media_cover4"
@@ -77,15 +109,49 @@
android:layout_height="@dimen/qs_aa_media_rec_album_size" android:layout_height="@dimen/qs_aa_media_rec_album_size"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:background="@drawable/bg_smartspace_media_item" android:background="@drawable/bg_smartspace_media_item"
android:backgroundTint="?androidprv:attr/colorAccentSecondary"
android:clipToOutline="true" android:clipToOutline="true"
android:scaleType="centerCrop"/> android:scaleType="centerCrop"/>
<ImageView <com.android.internal.widget.CachingIconView
android:id="@+id/media_logo4" android:id="@+id/media_logo4"
android:layout_width="@dimen/qs_aa_media_rec_icon_size" android:layout_width="@dimen/qs_media_icon_size"
android:layout_height="@dimen/qs_aa_media_rec_icon_size" /> android:layout_height="@dimen/qs_media_icon_size"
android:background="@drawable/qs_media_icon_background" />
<!-- Constraints are set here as they are the same regardless of host --> <ImageView
android:id="@+id/media_cover5"
android:layout_width="@dimen/qs_aa_media_rec_album_size"
android:layout_height="@dimen/qs_aa_media_rec_album_size"
android:adjustViewBounds="true"
android:background="@drawable/bg_smartspace_media_item"
android:backgroundTint="?androidprv:attr/colorAccentSecondary"
android:clipToOutline="true"
android:scaleType="centerCrop"/>
<com.android.internal.widget.CachingIconView
android:id="@+id/media_logo5"
android:layout_width="@dimen/qs_media_icon_size"
android:layout_height="@dimen/qs_media_icon_size"
android:background="@drawable/qs_media_icon_background" />
<ImageView
android:id="@+id/media_cover6"
android:layout_width="@dimen/qs_aa_media_rec_album_size"
android:layout_height="@dimen/qs_aa_media_rec_album_size"
android:adjustViewBounds="true"
android:background="@drawable/bg_smartspace_media_item"
android:backgroundTint="?androidprv:attr/colorAccentSecondary"
android:clipToOutline="true"
android:scaleType="centerCrop"/>
<com.android.internal.widget.CachingIconView
android:id="@+id/media_logo6"
android:layout_width="@dimen/qs_media_icon_size"
android:layout_height="@dimen/qs_media_icon_size"
android:background="@drawable/qs_media_icon_background" />
<!-- Long press menu -->
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -136,7 +202,8 @@
android:minWidth="48dp" android:minWidth="48dp"
android:minHeight="48dp" android:minHeight="48dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/dismiss" > app:layout_constraintEnd_toStartOf="@id/dismiss"
app:layout_constraintTop_toBottomOf="@id/remove_text">
<TextView <TextView
android:layout_gravity="bottom" android:layout_gravity="bottom"
@@ -158,7 +225,8 @@
android:minWidth="48dp" android:minWidth="48dp"
android:minHeight="48dp" android:minHeight="48dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"> app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/remove_text">
<TextView <TextView
android:layout_gravity="bottom" android:layout_gravity="bottom"

6
packages/SystemUI/res/values/dimens.xml
View File

@@ -1276,8 +1276,10 @@
<dimen name="qs_media_disabled_seekbar_vertical_padding">36dp</dimen> <dimen name="qs_media_disabled_seekbar_vertical_padding">36dp</dimen>
<!-- Size of Smartspace media recommendations cards in the QSPanel carousel --> <!-- Size of Smartspace media recommendations cards in the QSPanel carousel -->
<dimen name="qs_aa_media_rec_album_size">80dp</dimen> <dimen name="qs_aa_media_rec_header_icon_padding">10dp</dimen>
<dimen name="qs_aa_media_rec_icon_size">20dp</dimen> <dimen name="qs_aa_media_rec_header_icon_size">18dp</dimen>
<dimen name="qs_aa_media_rec_album_size">72dp</dimen>
<dimen name="qq_aa_media_rec_header_text_size">16sp</dimen>
<!-- Window magnification --> <!-- Window magnification -->
<dimen name="magnification_border_drag_size">35dp</dimen> <dimen name="magnification_border_drag_size">35dp</dimen>

3
packages/SystemUI/res/values/strings.xml
View File

@@ -2837,6 +2837,9 @@
<!-- Label for button to go to media control settings screen [CHAR_LIMIT=30] --> <!-- Label for button to go to media control settings screen [CHAR_LIMIT=30] -->
<string name="controls_media_settings_button">Settings</string> <string name="controls_media_settings_button">Settings</string>
<!-- Title for Smartspace recommendation card within media controls [CHAR_LIMIT=50] -->
<string name="controls_media_smartspace_rec_title">Play</string>
<!-- Error message indicating that a control timed out while waiting for an update [CHAR_LIMIT=30] --> <!-- Error message indicating that a control timed out while waiting for an update [CHAR_LIMIT=30] -->
<string name="controls_error_timeout">Inactive, check app</string> <string name="controls_error_timeout">Inactive, check app</string>
<!-- Error message indicating that an unspecified error occurred while getting the status, and <!-- Error message indicating that an unspecified error occurred while getting the status, and

97
packages/SystemUI/res/xml/media_recommendation.xml
View File

@@ -1,97 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2020 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
<ConstraintSet
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<Constraint
android:id="@+id/media_cover1"
android:layout_width="@dimen/qs_aa_media_rec_album_size"
android:layout_height="@dimen/qs_aa_media_rec_album_size"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/media_cover2"
app:layout_constraintHorizontal_weight="1"
android:visibility="gone"/>
<Constraint
android:id="@+id/media_logo1"
android:layout_width="@dimen/qs_aa_media_rec_icon_size"
android:layout_height="@dimen/qs_aa_media_rec_icon_size"
app:layout_constraintEnd_toEndOf="@+id/media_cover1"
app:layout_constraintBottom_toBottomOf="@+id/media_cover1"
android:visibility="gone" />
<Constraint
android:id="@+id/media_cover2"
android:layout_width="@dimen/qs_aa_media_rec_album_size"
android:layout_height="@dimen/qs_aa_media_rec_album_size"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/media_cover1"
app:layout_constraintEnd_toStartOf="@id/media_cover3"
app:layout_constraintHorizontal_weight="1"
android:visibility="gone"/>
<Constraint
android:id="@+id/media_logo2"
android:layout_width="@dimen/qs_aa_media_rec_icon_size"
android:layout_height="@dimen/qs_aa_media_rec_icon_size"
app:layout_constraintEnd_toEndOf="@+id/media_cover2"
app:layout_constraintBottom_toBottomOf="@+id/media_cover2"
android:visibility="gone" />
<Constraint
android:id="@+id/media_cover3"
android:layout_width="@dimen/qs_aa_media_rec_album_size"
android:layout_height="@dimen/qs_aa_media_rec_album_size"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/media_cover2"
app:layout_constraintEnd_toStartOf="@id/media_cover4"
app:layout_constraintHorizontal_weight="1"
android:visibility="gone"/>
<Constraint
android:id="@+id/media_logo3"
android:layout_width="@dimen/qs_aa_media_rec_icon_size"
android:layout_height="@dimen/qs_aa_media_rec_icon_size"
app:layout_constraintEnd_toEndOf="@+id/media_cover3"
app:layout_constraintBottom_toBottomOf="@+id/media_cover3"
android:visibility="gone" />
<Constraint
android:id="@+id/media_cover4"
android:layout_width="@dimen/qs_aa_media_rec_album_size"
android:layout_height="@dimen/qs_aa_media_rec_album_size"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/media_cover3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_weight="1"
android:visibility="gone"/>
<Constraint
android:id="@+id/media_logo4"
android:layout_width="@dimen/qs_aa_media_rec_icon_size"
android:layout_height="@dimen/qs_aa_media_rec_icon_size"
app:layout_constraintEnd_toEndOf="@+id/media_cover4"
app:layout_constraintBottom_toBottomOf="@+id/media_cover4"
android:visibility="gone" />
</ConstraintSet>

172
packages/SystemUI/res/xml/media_recommendation_collapsed.xml Normal file
View File

@@ -0,0 +1,172 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2020 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
<ConstraintSet
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<Constraint
android:id="@+id/recommendation_card_icon"
android:layout_width="@dimen/qs_aa_media_rec_header_icon_size"
android:layout_height="@dimen/qs_aa_media_rec_header_icon_size"
android:layout_marginTop="@dimen/qs_aa_media_rec_header_icon_padding"
android:layout_marginStart="@dimen/qs_aa_media_rec_header_icon_padding"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/media_vertical_start_guideline"
app:layout_constraintHorizontal_bias="0" />
<Constraint
android:id="@+id/recommendation_card_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/qs_aa_media_rec_header_icon_padding"
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" />
<Constraint
android:id="@+id/media_cover1"
android:layout_width="@dimen/qs_aa_media_rec_album_size"
android:layout_height="@dimen/qs_aa_media_rec_album_size"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/media_vertical_start_guideline"
app:layout_constraintEnd_toStartOf="@id/media_cover2"
app:layout_constraintHorizontal_chainStyle="spread"
android:visibility="gone" />
<Constraint
android:id="@+id/media_logo1"
android:layout_width="@dimen/qs_media_icon_size"
android:layout_height="@dimen/qs_media_icon_size"
android:translationY="@dimen/qs_media_icon_offset"
android:translationX="@dimen/qs_media_icon_offset"
app:layout_constraintEnd_toEndOf="@+id/media_cover1"
app:layout_constraintBottom_toBottomOf="@+id/media_cover1"
android:visibility="gone" />
<Constraint
android:id="@+id/media_cover2"
android:layout_width="@dimen/qs_aa_media_rec_album_size"
android:layout_height="@dimen/qs_aa_media_rec_album_size"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/media_cover1"
app:layout_constraintEnd_toStartOf="@id/media_cover3"
app:layout_constraintHorizontal_chainStyle="spread"
android:visibility="gone" />
<Constraint
android:id="@+id/media_logo2"
android:layout_width="@dimen/qs_media_icon_size"
android:layout_height="@dimen/qs_media_icon_size"
android:translationY="@dimen/qs_media_icon_offset"
android:translationX="@dimen/qs_media_icon_offset"
app:layout_constraintEnd_toEndOf="@+id/media_cover2"
app:layout_constraintBottom_toBottomOf="@+id/media_cover2"
android:visibility="gone" />
<Constraint
android:id="@+id/media_cover3"
android:layout_width="@dimen/qs_aa_media_rec_album_size"
android:layout_height="@dimen/qs_aa_media_rec_album_size"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/media_cover2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintHorizontal_bias="1"
android:visibility="gone" />
<Constraint
android:id="@+id/media_logo3"
android:layout_width="@dimen/qs_media_icon_size"
android:layout_height="@dimen/qs_media_icon_size"
android:translationY="@dimen/qs_media_icon_offset"
android:translationX="@dimen/qs_media_icon_offset"
app:layout_constraintEnd_toEndOf="@+id/media_cover3"
app:layout_constraintBottom_toBottomOf="@+id/media_cover3"
android:visibility="gone" />
<Constraint
android:id="@+id/media_cover4"
android:layout_width="@dimen/qs_aa_media_rec_album_size"
android:layout_height="0dp"
app:layout_constraintTop_toBottomOf="@+id/media_cover1"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/media_vertical_start_guideline"
app:layout_constraintEnd_toStartOf="@id/media_cover5"
app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintHorizontal_bias="1"
android:visibility="gone" />
<Constraint
android:id="@+id/media_logo4"
android:layout_width="@dimen/qs_media_icon_size"
android:layout_height="0dp"
android:translationY="@dimen/qs_media_icon_offset"
android:translationX="@dimen/qs_media_icon_offset"
app:layout_constraintEnd_toEndOf="@+id/media_cover4"
app:layout_constraintBottom_toBottomOf="@+id/media_cover4"
android:visibility="gone" />
<Constraint
android:id="@+id/media_cover5"
android:layout_width="@dimen/qs_aa_media_rec_album_size"
android:layout_height="0dp"
app:layout_constraintTop_toBottomOf="@+id/media_cover2"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/media_cover4"
app:layout_constraintEnd_toStartOf="@+id/media_cover6"
app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintHorizontal_bias="1"
android:visibility="gone" />
<Constraint
android:id="@+id/media_logo5"
android:layout_width="@dimen/qs_media_icon_size"
android:layout_height="0dp"
android:translationY="@dimen/qs_media_icon_offset"
android:translationX="@dimen/qs_media_icon_offset"
app:layout_constraintEnd_toEndOf="@+id/media_cover5"
app:layout_constraintBottom_toBottomOf="@+id/media_cover5"
android:visibility="gone" />
<Constraint
android:id="@+id/media_cover6"
android:layout_width="@dimen/qs_aa_media_rec_album_size"
android:layout_height="0dp"
app:layout_constraintTop_toBottomOf="@id/media_cover3"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/media_cover5"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintHorizontal_bias="1"
android:visibility="gone" />
<Constraint
android:id="@+id/media_logo6"
android:layout_width="@dimen/qs_media_icon_size"
android:layout_height="0dp"
android:translationY="@dimen/qs_media_icon_offset"
android:translationX="@dimen/qs_media_icon_offset"
app:layout_constraintEnd_toEndOf="@+id/media_cover6"
app:layout_constraintBottom_toBottomOf="@+id/media_cover6"
android:visibility="gone" />
</ConstraintSet>

181
packages/SystemUI/res/xml/media_recommendation_expanded.xml Normal file
View File

@@ -0,0 +1,181 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2020 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
<ConstraintSet
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<Constraint
android:id="@+id/recommendation_card_icon"
android:layout_width="@dimen/qs_aa_media_rec_header_icon_size"
android:layout_height="@dimen/qs_aa_media_rec_header_icon_size"
android:layout_marginTop="@dimen/qs_media_padding"
android:layout_marginStart="@dimen/qs_aa_media_rec_header_icon_padding"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/media_vertical_start_guideline"
app:layout_constraintHorizontal_bias="0" />
<Constraint
android:id="@+id/recommendation_card_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/qs_aa_media_rec_header_icon_padding"
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" />
<Constraint
android:id="@+id/media_cover1"
android:layout_width="@dimen/qs_aa_media_rec_album_size"
android:layout_height="@dimen/qs_aa_media_rec_album_size"
android:layout_marginTop="@dimen/qs_media_padding"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@+id/media_cover4"
app:layout_constraintStart_toEndOf="@id/media_vertical_start_guideline"
app:layout_constraintEnd_toStartOf="@id/media_cover2"
app:layout_constraintHorizontal_chainStyle="spread"
android:visibility="gone" />
<Constraint
android:id="@+id/media_logo1"
android:layout_width="@dimen/qs_media_icon_size"
android:layout_height="@dimen/qs_media_icon_size"
android:translationY="@dimen/qs_media_icon_offset"
android:translationX="@dimen/qs_media_icon_offset"
app:layout_constraintEnd_toEndOf="@+id/media_cover1"
app:layout_constraintBottom_toBottomOf="@+id/media_cover1"
android:visibility="gone" />
<Constraint
android:id="@+id/media_cover2"
android:layout_width="@dimen/qs_aa_media_rec_album_size"
android:layout_height="@dimen/qs_aa_media_rec_album_size"
android:layout_marginTop="@dimen/qs_media_padding"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@+id/media_cover5"
app:layout_constraintStart_toEndOf="@id/media_cover1"
app:layout_constraintEnd_toStartOf="@id/media_cover3"
app:layout_constraintHorizontal_chainStyle="spread"
android:visibility="gone" />
<Constraint
android:id="@+id/media_logo2"
android:layout_width="@dimen/qs_media_icon_size"
android:layout_height="@dimen/qs_media_icon_size"
android:translationY="@dimen/qs_media_icon_offset"
android:translationX="@dimen/qs_media_icon_offset"
app:layout_constraintEnd_toEndOf="@+id/media_cover2"
app:layout_constraintBottom_toBottomOf="@+id/media_cover2"
android:visibility="gone" />
<Constraint
android:id="@+id/media_cover3"
android:layout_width="@dimen/qs_aa_media_rec_album_size"
android:layout_height="@dimen/qs_aa_media_rec_album_size"
android:layout_marginTop="@dimen/qs_media_padding"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@+id/media_cover6"
app:layout_constraintStart_toEndOf="@id/media_cover2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintHorizontal_bias="1"
android:visibility="gone" />
<Constraint
android:id="@+id/media_logo3"
android:layout_width="@dimen/qs_media_icon_size"
android:layout_height="@dimen/qs_media_icon_size"
android:translationY="@dimen/qs_media_icon_offset"
android:translationX="@dimen/qs_media_icon_offset"
app:layout_constraintEnd_toEndOf="@+id/media_cover3"
app:layout_constraintBottom_toBottomOf="@+id/media_cover3"
android:visibility="gone" />
<Constraint
android:id="@+id/media_cover4"
android:layout_width="@dimen/qs_aa_media_rec_album_size"
android:layout_height="@dimen/qs_aa_media_rec_album_size"
android:layout_marginTop="@dimen/qs_media_padding"
android:layout_marginBottom="@dimen/qs_media_padding"
app:layout_constraintTop_toBottomOf="@+id/media_cover1"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/media_vertical_start_guideline"
app:layout_constraintEnd_toStartOf="@id/media_cover5"
app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintHorizontal_bias="1"
android:visibility="gone" />
<Constraint
android:id="@+id/media_logo4"
android:layout_width="@dimen/qs_media_icon_size"
android:layout_height="@dimen/qs_media_icon_size"
android:translationY="@dimen/qs_media_icon_offset"
android:translationX="@dimen/qs_media_icon_offset"
app:layout_constraintEnd_toEndOf="@+id/media_cover4"
app:layout_constraintBottom_toBottomOf="@+id/media_cover4"
android:visibility="gone" />
<Constraint
android:id="@+id/media_cover5"
android:layout_width="@dimen/qs_aa_media_rec_album_size"
android:layout_height="@dimen/qs_aa_media_rec_album_size"
android:layout_marginTop="@dimen/qs_media_padding"
android:layout_marginBottom="@dimen/qs_media_padding"
app:layout_constraintTop_toBottomOf="@+id/media_cover2"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/media_cover4"
app:layout_constraintEnd_toStartOf="@+id/media_cover6"
app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintHorizontal_bias="1"
android:visibility="gone" />
<Constraint
android:id="@+id/media_logo5"
android:layout_width="@dimen/qs_media_icon_size"
android:layout_height="@dimen/qs_media_icon_size"
android:translationY="@dimen/qs_media_icon_offset"
android:translationX="@dimen/qs_media_icon_offset"
app:layout_constraintEnd_toEndOf="@+id/media_cover5"
app:layout_constraintBottom_toBottomOf="@+id/media_cover5"
android:visibility="gone" />
<Constraint
android:id="@+id/media_cover6"
android:layout_width="@dimen/qs_aa_media_rec_album_size"
android:layout_height="@dimen/qs_aa_media_rec_album_size"
android:layout_marginTop="@dimen/qs_media_padding"
android:layout_marginBottom="@dimen/qs_media_padding"
app:layout_constraintTop_toBottomOf="@id/media_cover3"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/media_cover5"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintHorizontal_bias="1"
android:visibility="gone" />
<Constraint
android:id="@+id/media_logo6"
android:layout_width="@dimen/qs_media_icon_size"
android:layout_height="@dimen/qs_media_icon_size"
android:translationY="@dimen/qs_media_icon_offset"
android:translationX="@dimen/qs_media_icon_offset"
app:layout_constraintEnd_toEndOf="@+id/media_cover6"
app:layout_constraintBottom_toBottomOf="@+id/media_cover6"
android:visibility="gone" />
</ConstraintSet>

2
packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt
View File

@@ -317,7 +317,7 @@ class MediaCarouselController @Inject constructor(
val lp = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, val lp = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.WRAP_CONTENT) ViewGroup.LayoutParams.WRAP_CONTENT)
newRecs.recommendationViewHolder?.recommendations?.setLayoutParams(lp) newRecs.recommendationViewHolder?.recommendations?.setLayoutParams(lp)
newRecs.bindRecommendation(data, bgColor) newRecs.bindRecommendation(data, fgColor, bgColor)
MediaPlayerData.addMediaPlayer(key, newRecs) MediaPlayerData.addMediaPlayer(key, newRecs)
updatePlayerToState(newRecs, noAnimation = true) updatePlayerToState(newRecs, noAnimation = true)
reorderAllPlayers() reorderAllPlayers()

28
packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java
View File

@@ -25,6 +25,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.res.ColorStateList; import android.content.res.ColorStateList;
import android.graphics.PorterDuff;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.graphics.drawable.Icon; import android.graphics.drawable.Icon;
@@ -67,9 +68,9 @@ import dagger.Lazy;
public class MediaControlPanel { public class MediaControlPanel {
private static final String TAG = "MediaControlPanel"; private static final String TAG = "MediaControlPanel";
private static final float DISABLED_ALPHA = 0.38f; private static final float DISABLED_ALPHA = 0.38f;
private static final String EXTRAS_MEDIA_SOURCE_LOGO = "media_source_logo";
private static final String EXTRAS_MEDIA_SOURCE_PACKAGE_NAME = "package_name"; private static final String EXTRAS_MEDIA_SOURCE_PACKAGE_NAME = "package_name";
private static final int MEDIA_RECOMMENDATION_MAX_NUM = 4; private static final int MEDIA_RECOMMENDATION_ITEMS_PER_ROW = 3;
private static final int MEDIA_RECOMMENDATION_MAX_NUM = 6;
private static final Intent SETTINGS_INTENT = new Intent(ACTION_MEDIA_CONTROLS_SETTINGS); private static final Intent SETTINGS_INTENT = new Intent(ACTION_MEDIA_CONTROLS_SETTINGS);
@@ -456,11 +457,17 @@ public class MediaControlPanel {
} }
/** Bind this recommendation view based on the data given. */ /** Bind this recommendation view based on the data given. */
public void bindRecommendation(@NonNull SmartspaceTarget target, @NonNull int backgroundColor) { public void bindRecommendation(
@NonNull SmartspaceTarget target,
@NonNull int primaryColor,
@NonNull int backgroundColor) {
if (mRecommendationViewHolder == null) { if (mRecommendationViewHolder == null) {
return; return;
} }
mRecommendationViewHolder.getCardIcon().setColorFilter(primaryColor);
mRecommendationViewHolder.getCardText().setTextColor(primaryColor);
mRecommendationViewHolder.getRecommendations() mRecommendationViewHolder.getRecommendations()
.setBackgroundTintList(ColorStateList.valueOf(backgroundColor)); .setBackgroundTintList(ColorStateList.valueOf(backgroundColor));
mBackgroundColor = backgroundColor; mBackgroundColor = backgroundColor;
@@ -506,6 +513,8 @@ public class MediaControlPanel {
// Set up media source app's logo. // Set up media source app's logo.
ImageView mediaSourceLogoImageView = mediaLogoItems.get(i); ImageView mediaSourceLogoImageView = mediaLogoItems.get(i);
mediaSourceLogoImageView.setImageDrawable(icon); mediaSourceLogoImageView.setImageDrawable(icon);
// TODO(b/186699032): Tint the app logo using the accent color.
mediaSourceLogoImageView.setColorFilter(backgroundColor, PorterDuff.Mode.XOR);
// Set up media item cover. // Set up media item cover.
ImageView mediaCoverImageView = mediaCoverItems.get(i); ImageView mediaCoverImageView = mediaCoverItems.get(i);
@@ -516,14 +525,17 @@ public class MediaControlPanel {
mediaCoverImageView, mediaCoverImageView,
recommendation, recommendation,
target.getSmartspaceTargetId(), target.getSmartspaceTargetId(),
view -> mMediaDataManagerLazy null);
.get()
.dismissSmartspaceRecommendation(0L /* delay */));
if (i < MEDIA_RECOMMENDATION_ITEMS_PER_ROW) {
setVisibleAndAlpha(collapsedSet, mediaCoverItemsResIds.get(i), true);
setVisibleAndAlpha(collapsedSet, mediaLogoItemsResIds.get(i), true);
} else {
setVisibleAndAlpha(collapsedSet, mediaCoverItemsResIds.get(i), false);
setVisibleAndAlpha(collapsedSet, mediaLogoItemsResIds.get(i), false);
}
setVisibleAndAlpha(expandedSet, mediaCoverItemsResIds.get(i), true); setVisibleAndAlpha(expandedSet, mediaCoverItemsResIds.get(i), true);
setVisibleAndAlpha(expandedSet, mediaLogoItemsResIds.get(i), true); setVisibleAndAlpha(expandedSet, mediaLogoItemsResIds.get(i), true);
setVisibleAndAlpha(collapsedSet, mediaCoverItemsResIds.get(i), true);
setVisibleAndAlpha(collapsedSet, mediaLogoItemsResIds.get(i), true);
} }
// Set up long press to show guts setting panel. // Set up long press to show guts setting panel.

4
packages/SystemUI/src/com/android/systemui/media/MediaViewController.kt
View File

@@ -466,8 +466,8 @@ class MediaViewController @Inject constructor(
collapsedLayout.load(context, R.xml.media_collapsed) collapsedLayout.load(context, R.xml.media_collapsed)
expandedLayout.load(context, R.xml.media_expanded) expandedLayout.load(context, R.xml.media_expanded)
} else { } else {
collapsedLayout.load(context, R.xml.media_recommendation) collapsedLayout.load(context, R.xml.media_recommendation_collapsed)
expandedLayout.load(context, R.xml.media_recommendation) expandedLayout.load(context, R.xml.media_recommendation_expanded)
} }
refreshState() refreshState()
} }

27
packages/SystemUI/src/com/android/systemui/media/RecommendationViewHolder.kt
View File

@@ -20,6 +20,7 @@ import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.ImageView import android.widget.ImageView
import android.widget.TextView
import androidx.annotation.IntegerRes import androidx.annotation.IntegerRes
import com.android.systemui.R import com.android.systemui.R
import com.android.systemui.util.animation.TransitionLayout import com.android.systemui.util.animation.TransitionLayout
@@ -30,26 +31,36 @@ class RecommendationViewHolder private constructor(itemView: View) {
val recommendations = itemView as TransitionLayout val recommendations = itemView as TransitionLayout
// Recommendation screen // Recommendation screen
val cardIcon = itemView.requireViewById<ImageView>(R.id.recommendation_card_icon)
val cardText = itemView.requireViewById<TextView>(R.id.recommendation_card_text)
val mediaCoverItems = listOf<ImageView>( val mediaCoverItems = listOf<ImageView>(
itemView.requireViewById(R.id.media_cover1), itemView.requireViewById(R.id.media_cover1),
itemView.requireViewById(R.id.media_cover2), itemView.requireViewById(R.id.media_cover2),
itemView.requireViewById(R.id.media_cover3), itemView.requireViewById(R.id.media_cover3),
itemView.requireViewById(R.id.media_cover4)) itemView.requireViewById(R.id.media_cover4),
itemView.requireViewById(R.id.media_cover5),
itemView.requireViewById(R.id.media_cover6))
val mediaLogoItems = listOf<ImageView>( val mediaLogoItems = listOf<ImageView>(
itemView.requireViewById(R.id.media_logo1), itemView.requireViewById(R.id.media_logo1),
itemView.requireViewById(R.id.media_logo2), itemView.requireViewById(R.id.media_logo2),
itemView.requireViewById(R.id.media_logo3), itemView.requireViewById(R.id.media_logo3),
itemView.requireViewById(R.id.media_logo4)) itemView.requireViewById(R.id.media_logo4),
itemView.requireViewById(R.id.media_logo5),
itemView.requireViewById(R.id.media_logo6))
val mediaCoverItemsResIds = listOf<@IntegerRes Int>( val mediaCoverItemsResIds = listOf<@IntegerRes Int>(
R.id.media_cover1, R.id.media_cover1,
R.id.media_cover2, R.id.media_cover2,
R.id.media_cover3, R.id.media_cover3,
R.id.media_cover4) R.id.media_cover4,
R.id.media_cover5,
R.id.media_cover6)
val mediaLogoItemsResIds = listOf<@IntegerRes Int>( val mediaLogoItemsResIds = listOf<@IntegerRes Int>(
R.id.media_logo1, R.id.media_logo1,
R.id.media_logo2, R.id.media_logo2,
R.id.media_logo3, R.id.media_logo3,
R.id.media_logo4) R.id.media_logo4,
R.id.media_logo5,
R.id.media_logo6)
// Settings/Guts screen // Settings/Guts screen
val cancel = itemView.requireViewById<View>(R.id.cancel) val cancel = itemView.requireViewById<View>(R.id.cancel)
@@ -91,14 +102,20 @@ class RecommendationViewHolder private constructor(itemView: View) {
// Res Ids for the control components on the recommendation view. // Res Ids for the control components on the recommendation view.
val controlsIds = setOf( val controlsIds = setOf(
R.id.recommendation_card_icon,
R.id.recommendation_card_text,
R.id.media_cover1, R.id.media_cover1,
R.id.media_cover2, R.id.media_cover2,
R.id.media_cover3, R.id.media_cover3,
R.id.media_cover4, R.id.media_cover4,
R.id.media_cover5,
R.id.media_cover6,
R.id.media_logo1, R.id.media_logo1,
R.id.media_logo2, R.id.media_logo2,
R.id.media_logo3, R.id.media_logo3,
R.id.media_logo4 R.id.media_logo4,
R.id.media_logo5,
R.id.media_logo6
) )
// Res Ids for the components on the guts panel. // Res Ids for the components on the guts panel.