Merge "Media control icon adjustments" into sc-dev am: 7a50ad7a88

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14748553

Change-Id: Ib8c47e944bc5c1158c973ea1228b8f238f308960
This commit is contained in:
TreeHugger Robot
2021-06-02 19:29:03 +00:00
committed by Automerger Merge Worker
2 changed files with 4 additions and 4 deletions

View File

@@ -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">

View File

@@ -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());