Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Media control icon adjustments" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-02 19:19:24 +00:00
committed by Android (Google) Code Review
parent 1cdc8379a8 9cf9543a9d
commit 7a50ad7a88
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/res/values/styles.xml
View File

@@ -642,7 +642,7 @@
<item name="android:tint">?android:attr/textColorPrimary</item> <item name="android:tint">?android:attr/textColorPrimary</item>
<item name="android:stateListAnimator">@anim/media_button_state_list_animator</item> <item name="android:stateListAnimator">@anim/media_button_state_list_animator</item>
<item name="android:padding">12dp</item> <item name="android:padding">12dp</item>
<item name="android:scaleType">fitCenter</item> <item name="android:scaleType">centerInside</item>
</style> </style>
<style name="MediaPlayer.OutlineButton"> <style name="MediaPlayer.OutlineButton">
@@ -662,7 +662,8 @@
<style name="MediaPlayer.AppIcon"> <style name="MediaPlayer.AppIcon">
<item name="android:background">@drawable/qs_media_icon_background</item> <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>
<style name="MediaPlayer.Album"> <style name="MediaPlayer.Album">

3
packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java
View File

@@ -315,8 +315,7 @@ public class MediaControlPanel {
appIconView.clearColorFilter(); appIconView.clearColorFilter();
if (data.getAppIcon() != null && !data.getResumption()) { if (data.getAppIcon() != null && !data.getResumption()) {
appIconView.setImageIcon(data.getAppIcon()); appIconView.setImageIcon(data.getAppIcon());
int color = Utils.getColorAttrDefaultColor(mContext, int color = mContext.getColor(android.R.color.system_accent2_900);
com.android.internal.R.attr.colorAccentTertiary);
appIconView.setColorFilter(color); appIconView.setColorFilter(color);
} else { } else {
appIconView.setColorFilter(getGrayscaleFilter()); appIconView.setColorFilter(getGrayscaleFilter());