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

Commit d1dc8972 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Let there be color" into qt-dev 

am: e4b593b8

Change-Id: I3e5f09a5dc4baf20303034296f135fb0e0b7ad65
parents 127a8833 e4b593b8

core/java/com/android/internal/util/ContrastColorUtil.java

+1 −1
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ public class ContrastColorUtil { 
     * Resolves {@param color} to an actual color if it is {@link Notification#COLOR_DEFAULT}

     */

    public static int resolveColor(Context context, int color, boolean defaultBackgroundIsDark) {

        if (color == Notification.COLOR_DEFAULT || defaultBackgroundIsDark) {

        if (color == Notification.COLOR_DEFAULT) {

            int res = defaultBackgroundIsDark

                    ? com.android.internal.R.color.notification_default_color_dark

                    : com.android.internal.R.color.notification_default_color_light;