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

Merge "Add minimum height and width to recommendation covers" into tm-qpr-dev

Browse Source
This commit is contained in:
Michael Mikhail
2023-03-17 21:34:39 +00:00
committed by Android (Google) Code Review
parent 2a4e3c2aaa a08adafba9
commit d9d9966c59
5 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/res/layout/media_recommendation_view.xml
View File

@@ -31,8 +31,10 @@
<!-- App icon --> <!-- App icon -->
<com.android.internal.widget.CachingIconView <com.android.internal.widget.CachingIconView
android:id="@+id/media_rec_app_icon" android:id="@+id/media_rec_app_icon"
android:layout_width="@dimen/qs_media_rec_icon_top_margin" android:layout_width="@dimen/qs_media_rec_album_icon_size"
android:layout_height="@dimen/qs_media_rec_icon_top_margin" android:layout_height="@dimen/qs_media_rec_album_icon_size"
android:minWidth="@dimen/qs_media_rec_album_icon_size"
android:minHeight="@dimen/qs_media_rec_album_icon_size"
android:layout_marginStart="@dimen/qs_media_info_spacing" android:layout_marginStart="@dimen/qs_media_info_spacing"
android:layout_marginTop="@dimen/qs_media_info_spacing"/> android:layout_marginTop="@dimen/qs_media_info_spacing"/>

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

@@ -40,6 +40,8 @@
android:id="@+id/recommendation_card_icon" android:id="@+id/recommendation_card_icon"
android:layout_width="@dimen/qs_media_app_icon_size" android:layout_width="@dimen/qs_media_app_icon_size"
android:layout_height="@dimen/qs_media_app_icon_size" android:layout_height="@dimen/qs_media_app_icon_size"
android:minWidth="@dimen/qs_media_app_icon_size"
android:minHeight="@dimen/qs_media_app_icon_size"
android:layout_marginStart="@dimen/qs_media_padding" android:layout_marginStart="@dimen/qs_media_padding"
android:layout_marginTop="@dimen/qs_media_rec_icon_top_margin" android:layout_marginTop="@dimen/qs_media_rec_icon_top_margin"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@@ -53,6 +55,8 @@
android:id="@+id/media_cover1" android:id="@+id/media_cover1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:minWidth="@dimen/qs_media_rec_album_size"
android:minHeight="@dimen/qs_media_rec_album_size"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
android:adjustViewBounds="true" android:adjustViewBounds="true"
@@ -80,6 +84,8 @@
android:id="@+id/media_cover2" android:id="@+id/media_cover2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:minWidth="@dimen/qs_media_rec_album_size"
android:minHeight="@dimen/qs_media_rec_album_size"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:background="@drawable/bg_smartspace_media_item" android:background="@drawable/bg_smartspace_media_item"
style="@style/MediaPlayer.Recommendation.Album" style="@style/MediaPlayer.Recommendation.Album"
@@ -105,6 +111,8 @@
android:id="@+id/media_cover3" android:id="@+id/media_cover3"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:minWidth="@dimen/qs_media_rec_album_size"
android:minHeight="@dimen/qs_media_rec_album_size"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:background="@drawable/bg_smartspace_media_item" android:background="@drawable/bg_smartspace_media_item"
style="@style/MediaPlayer.Recommendation.Album" style="@style/MediaPlayer.Recommendation.Album"

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

@@ -1102,6 +1102,7 @@
<!-- Size of Smartspace media recommendations cards in the QSPanel carousel --> <!-- Size of Smartspace media recommendations cards in the QSPanel carousel -->
<dimen name="qs_media_rec_icon_top_margin">16dp</dimen> <dimen name="qs_media_rec_icon_top_margin">16dp</dimen>
<dimen name="qs_media_rec_album_icon_size">16dp</dimen>
<dimen name="qs_media_rec_album_size">88dp</dimen> <dimen name="qs_media_rec_album_size">88dp</dimen>
<dimen name="qs_media_rec_album_width">110dp</dimen> <dimen name="qs_media_rec_album_width">110dp</dimen>
<dimen name="qs_media_rec_album_height_expanded">108dp</dimen> <dimen name="qs_media_rec_album_height_expanded">108dp</dimen>

2
packages/SystemUI/res/values/styles.xml
View File

@@ -699,6 +699,8 @@
<style name="MediaPlayer.Recommendation.AlbumContainer.Updated"> <style name="MediaPlayer.Recommendation.AlbumContainer.Updated">
<item name="android:layout_width">@dimen/qs_media_rec_album_width</item> <item name="android:layout_width">@dimen/qs_media_rec_album_width</item>
<item name="android:minWidth">@dimen/qs_media_rec_album_width</item>
<item name="android:minHeight">@dimen/qs_media_rec_album_height_collapsed</item>
<item name="android:background">@drawable/qs_media_light_source</item> <item name="android:background">@drawable/qs_media_light_source</item>
<item name="android:layout_marginTop">@dimen/qs_media_info_spacing</item> <item name="android:layout_marginTop">@dimen/qs_media_info_spacing</item>
</style> </style>

3
packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaControlPanel.java
View File

@@ -1370,7 +1370,8 @@ public class MediaControlPanel {
itemIndex itemIndex
); );
} else { } else {
mediaCoverImageView.setImageIcon(recommendation.getIcon()); mediaCoverImageView.post(
() -> mediaCoverImageView.setImageIcon(recommendation.getIcon()));
} }
// Set up the media item's click listener if applicable. // Set up the media item's click listener if applicable.