Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bb1cb39 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Ibfa62cf5fe3a2c906c077d52120dc508bb1226e2
parents cb4fce7b 7a50ad7a

packages/SystemUI/res/values/styles.xml

+3 −2
Original line number Diff line number Diff line
@@ -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">

packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java

+1 −2
Original line number Diff line number Diff line
@@ -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());