From 9cf9543a9da51b7c445f4d21c21a65d643a2a297 Mon Sep 17 00:00:00 2001
From: Beth Thibodeau <ethibodeau@google.com>
Date: Thu, 27 May 2021 00:17:23 -0400
Subject: [PATCH] Media control icon adjustments

- change scaleType to centerInside so icons are resized evenly
- Pad app icon and invert colors

Fixes: 188994303
Bug: 187421292

Test: visual, toggle dark mode
Change-Id: I78d760717ee1a8ad9c9899ad4b38aa3fd9034b2f
---
 packages/SystemUI/res/values/styles.xml                      | 5 +++--
 .../src/com/android/systemui/media/MediaControlPanel.java    | 3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index aadcaba09402e..7aab44fee486e 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -643,7 +643,7 @@
         <item name="android:tint">?android:attr/textColorPrimary</item>
         <item name="android:stateListAnimator">@anim/media_button_state_list_animator</item>
         <item name="android:padding">12dp</item>
-        <item name="android:scaleType">fitCenter</item>
+        <item name="android:scaleType">centerInside</item>
     </style>
 
     <style name="MediaPlayer.OutlineButton">
@@ -663,7 +663,8 @@
 
     <style name="MediaPlayer.AppIcon">
         <item name="android:background">@drawable/qs_media_icon_background</item>
-        <item name="android:backgroundTint">?android:attr/textColorPrimary</item>
+        <item name="android:backgroundTint">@color/media_player_solid_button_bg</item>
+        <item name="android:padding">4dp</item>
     </style>
 
     <style name="MediaPlayer.Album">
diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java b/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java
index 8532a46f0fc5d..7d159f27979f1 100644
--- a/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java
@@ -318,8 +318,7 @@ public class MediaControlPanel {
         appIconView.clearColorFilter();
         if (data.getAppIcon() != null && !data.getResumption()) {
             appIconView.setImageIcon(data.getAppIcon());
-            int color = Utils.getColorAttrDefaultColor(mContext,
-                    com.android.internal.R.attr.colorAccentTertiary);
+            int color = mContext.getColor(android.R.color.system_accent2_900);
             appIconView.setColorFilter(color);
         } else {
             appIconView.setColorFilter(getGrayscaleFilter());