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

Commit e0e621d1 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge remote-tracking branch 'origin/v4.0-a15' into a15

parents ed580552 71ead0e9

core/java/android/app/Notification.java

+2 −3
Original line number Diff line number Diff line
@@ -6982,7 +6982,7 @@ public class Notification implements Parcelable 
            if (emphasizedMode) {

                // change the background bgColor

                CharSequence title = action.title;

                int buttonFillColor = getColors(p).getSecondaryAccentColor();

                int buttonFillColor = getColors(p).getPrimaryAccentColor();

                if (tombstone) {

                    buttonFillColor = setAlphaComponentByFloatDimen(mContext,

                            ContrastColorUtil.resolveSecondaryColor(
@@ -7028,8 +7028,7 @@ public class Notification implements Parcelable 
                } else {

                    button.setTextViewText(R.id.action0, label);

                }

                int textColor = ContrastColorUtil.resolvePrimaryColor(mContext,

                        buttonFillColor, mInNightMode);

                int textColor = getColors(p).getBackgroundColor();

                if (tombstone) {

                    textColor = setAlphaComponentByFloatDimen(mContext,

                            ContrastColorUtil.resolveSecondaryColor(