diff options
5 files changed, 9 insertions, 17 deletions
diff --git a/packages/SystemUI/res/layout/media_session_view.xml b/packages/SystemUI/res/layout/media_session_view.xml index b67b7bc3b92e..665edac65afc 100644 --- a/packages/SystemUI/res/layout/media_session_view.xml +++ b/packages/SystemUI/res/layout/media_session_view.xml @@ -63,8 +63,8 @@ <!-- App icon --> <com.android.internal.widget.CachingIconView android:id="@+id/icon" - android:layout_width="24dp" - android:layout_height="24dp" + android:layout_width="@dimen/qs_media_app_icon_size" + android:layout_height="@dimen/qs_media_app_icon_size" android:layout_marginStart="@dimen/qs_media_padding" android:layout_marginTop="@dimen/qs_media_padding" app:layout_constraintStart_toStartOf="parent" diff --git a/packages/SystemUI/res/layout/media_smartspace_recommendations.xml b/packages/SystemUI/res/layout/media_smartspace_recommendations.xml index 6611c59651fc..5510f24870bb 100644 --- a/packages/SystemUI/res/layout/media_smartspace_recommendations.xml +++ b/packages/SystemUI/res/layout/media_smartspace_recommendations.xml @@ -36,7 +36,12 @@ <com.android.internal.widget.CachingIconView android:id="@+id/recommendation_card_icon" - style="@style/MediaPlayer.Recommendation.AppIcon" /> + android:layout_width="@dimen/qs_media_app_icon_size" + android:layout_height="@dimen/qs_media_app_icon_size" + android:layout_marginStart="@dimen/qs_media_padding" + android:layout_marginTop="@dimen/qs_media_padding" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> <FrameLayout android:id="@+id/media_cover1_container" diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index a0115e8865fc..4a8fd1b00dde 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -970,6 +970,7 @@ <dimen name="qs_seamless_icon_size">12dp</dimen> <dimen name="qs_media_disabled_seekbar_height">1dp</dimen> <dimen name="qs_media_enabled_seekbar_height">2dp</dimen> + <dimen name="qs_media_app_icon_size">24dp</dimen> <dimen name="qs_media_session_enabled_seekbar_vertical_padding">15dp</dimen> <dimen name="qs_media_session_disabled_seekbar_vertical_padding">16dp</dimen> @@ -985,7 +986,6 @@ <dimen name="qs_media_rec_album_size">88dp</dimen> <dimen name="qs_media_rec_album_side_margin">16dp</dimen> <dimen name="qs_media_rec_album_bottom_margin">8dp</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> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 827631b7eb53..c93c0652a070 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -655,18 +655,6 @@ <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: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> diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java b/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java index 915c3f294a59..48a63ed0a2d6 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java +++ b/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java @@ -980,7 +980,6 @@ public class MediaControlPanel { PackageManager packageManager = mContext.getPackageManager(); // Set up media source app's logo. Drawable icon = packageManager.getApplicationIcon(applicationInfo); - icon.setColorFilter(getGrayscaleFilter()); ImageView headerLogoImageView = mRecommendationViewHolder.getCardIcon(); headerLogoImageView.setImageDrawable(icon); |