From 93adaef7c98ecb200d5271af23012c973d581a76 Mon Sep 17 00:00:00 2001
From: Caitlin Cassidy <ccassidy@google.com>
Date: Fri, 15 Apr 2022 14:01:04 +0000
Subject: [PATCH] [Media recs] Update app icon to have full color and clean up
 layout params.

Fixes: 229257989
Bug: 223603970
Test: manual (verify app logo is shown in full color)
Change-Id: I94c9a618cdeabdb17901a4e740575b4885343644
---
 packages/SystemUI/res/layout/media_session_view.xml  |  4 ++--
 .../res/layout/media_smartspace_recommendations.xml  |  7 ++++++-
 packages/SystemUI/res/values/dimens.xml              |  2 +-
 packages/SystemUI/res/values/styles.xml              | 12 ------------
 .../android/systemui/media/MediaControlPanel.java    |  1 -
 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 b67b7bc3b92e8..665edac65afc3 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 6611c59651fc3..5510f24870bbd 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 80582efec6a46..f3f15e10f95f7 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -967,6 +967,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>
@@ -982,7 +983,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 827631b7eb531..c93c0652a070b 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 915c3f294a59a..48a63ed0a2d64 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);