diff options
| author | 2021-06-02 19:19:24 +0000 | |
|---|---|---|
| committer | 2021-06-02 19:19:24 +0000 | |
| commit | 7a50ad7a88193e61c890c5c7cd874846f44bc9b6 (patch) | |
| tree | 17e240938865781c50a9fcad1cef97be65a69a12 | |
| parent | 1cdc8379a8f13098de337c918fac322d60cfa3a5 (diff) | |
| parent | 9cf9543a9da51b7c445f4d21c21a65d643a2a297 (diff) | |
Merge "Media control icon adjustments" into sc-dev
| -rw-r--r-- | packages/SystemUI/res/values/styles.xml | 5 | ||||
| -rw-r--r-- | packages/SystemUI/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 6a848fbd2a26..46511682464b 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -642,7 +642,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"> @@ -662,7 +662,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 55feea970e84..d698142674ce 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java +++ b/packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java @@ -315,8 +315,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()); |