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

Commit 3914ab73 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '4212-main-notification' into 'main' 

Fix notification icon color

See merge request !58
parents 659f2f89 2e1ad14b

src/com/android/deskclock/alarms/AlarmNotifications.java

+6 −7
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import com.android.deskclock.DeskClock; 
import com.android.deskclock.LogUtils;

import com.android.deskclock.NotificationUtils;

import com.android.deskclock.R;

import com.android.deskclock.ThemeUtils;

import com.android.deskclock.provider.Alarm;

import com.android.deskclock.provider.AlarmInstance;
@@ -99,7 +98,7 @@ public final class AlarmNotifications { 
                                R.string.alarm_alert_predismiss_title))

                        .setContentText(AlarmUtils.getAlarmText(

                                context, instance, true /* includeLabel */))

                        .setColor(ThemeUtils.resolveColor(context, R.attr.colorSurface))

                        .setColor(ContextCompat.getColor(context, R.color.e_accent))

                        .setSmallIcon(R.drawable.stat_notify_alarm)

                        .setAutoCancel(false)

                        .setSortKey(createSortKey(instance))
@@ -208,7 +207,7 @@ public final class AlarmNotifications { 
                        ALARM_UPCOMING_NOTIFICATION_CHANNEL_ID)

                    .setShowWhen(false)

                    .setContentIntent(firstUpcoming.contentIntent)

                    .setColor(ThemeUtils.resolveColor(context, R.attr.colorSurface))

                    .setColor(ContextCompat.getColor(context, R.color.e_accent))

                    .setSmallIcon(R.drawable.stat_notify_alarm)

                    .setGroup(UPCOMING_GROUP_KEY)

                    .setGroupSummary(true)
@@ -238,7 +237,7 @@ public final class AlarmNotifications { 
            summary = new NotificationCompat.Builder(context, ALARM_MISSED_NOTIFICATION_CHANNEL_ID)

                    .setShowWhen(false)

                    .setContentIntent(firstMissed.contentIntent)

                    .setColor(ThemeUtils.resolveColor(context, R.attr.colorSurface))

                    .setColor(ContextCompat.getColor(context, R.color.e_accent))

                    .setSmallIcon(R.drawable.stat_notify_alarm)

                    .setGroup(MISSED_GROUP_KEY)

                    .setGroupSummary(true)
@@ -261,7 +260,7 @@ public final class AlarmNotifications { 
                        .setContentTitle(instance.getLabelOrDefault(context))

                        .setContentText(context.getString(R.string.alarm_alert_snooze_until,

                                AlarmUtils.getFormattedTime(context, instance.getAlarmTime())))

                        .setColor(ThemeUtils.resolveColor(context, R.attr.colorSurface))

                        .setColor(ContextCompat.getColor(context, R.color.e_accent))

                        .setSmallIcon(R.drawable.stat_notify_alarm)

                        .setAutoCancel(false)

                        .setSortKey(createSortKey(instance))
@@ -304,7 +303,7 @@ public final class AlarmNotifications { 
                        .setContentTitle(context.getString(R.string.alarm_missed_title))

                        .setContentText(instance.mLabel.isEmpty() ? alarmTime :

                                context.getString(R.string.alarm_missed_text, alarmTime, label))

                        .setColor(ThemeUtils.resolveColor(context, R.attr.colorSurface))

                        .setColor(ContextCompat.getColor(context, R.color.e_accent))

                        .setSortKey(createSortKey(instance))

                        .setSmallIcon(R.drawable.stat_notify_alarm)

                        .setPriority(NotificationCompat.PRIORITY_HIGH)
@@ -345,7 +344,7 @@ public final class AlarmNotifications { 
                        .setContentTitle(instance.getLabelOrDefault(service))

                        .setContentText(AlarmUtils.getFormattedTime(

                                service, instance.getAlarmTime()))

                        .setColor(ThemeUtils.resolveColor(service, R.attr.colorSurface))

                        .setColor(ContextCompat.getColor(service, R.color.e_accent))

                        .setSmallIcon(R.drawable.stat_notify_alarm)

                        .setOngoing(true)

                        .setAutoCancel(false)

src/com/android/deskclock/data/StopwatchNotificationBuilder.java

+1 −2
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import androidx.core.content.ContextCompat; 
import com.android.deskclock.DeskClock;

import com.android.deskclock.NotificationUtils;

import com.android.deskclock.R;

import com.android.deskclock.ThemeUtils;

import com.android.deskclock.Utils;

import com.android.deskclock.events.Events;

import com.android.deskclock.stopwatch.StopwatchService;
@@ -137,7 +136,7 @@ class StopwatchNotificationBuilder { 
                        .setPriority(NotificationManager.IMPORTANCE_LOW)

                        .setSmallIcon(R.drawable.stat_notify_stopwatch)

                        .setStyle(new NotificationCompat.DecoratedCustomViewStyle())

                        .setColor(ThemeUtils.resolveColor(context, R.attr.colorSurface))

                        .setColor(ContextCompat.getColor(context, R.color.e_accent))

                        .setGroup(nm.getStopwatchNotificationGroupKey());



        for (Action action : actions) {

src/com/android/deskclock/data/TimerNotificationBuilder.java

+3 −4
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import androidx.core.content.ContextCompat; 
import com.android.deskclock.DeskClock;

import com.android.deskclock.NotificationUtils;

import com.android.deskclock.R;

import com.android.deskclock.ThemeUtils;

import com.android.deskclock.Utils;

import com.android.deskclock.events.Events;

import com.android.deskclock.timer.ExpiredTimersActivity;
@@ -151,7 +150,7 @@ class TimerNotificationBuilder { 
                        .setSortKey(nm.getTimerNotificationSortKey())

                        .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)

                        .setStyle(new NotificationCompat.DecoratedCustomViewStyle())

                        .setColor(ThemeUtils.resolveColor(context, R.attr.colorSurface))

                        .setColor(ContextCompat.getColor(context, R.color.e_accent))

                        .setCustomContentView(buildChronometer(pname, base, running, stateText))

                        .setGroup(nm.getTimerNotificationGroupKey());
@@ -224,7 +223,7 @@ class TimerNotificationBuilder { 
                        .setSmallIcon(R.drawable.stat_notify_timer)

                        .setFullScreenIntent(pendingFullScreen, true)

                        .setStyle(new NotificationCompat.DecoratedCustomViewStyle())

                        .setColor(ThemeUtils.resolveColor(context, R.attr.colorSurface))

                        .setColor(ContextCompat.getColor(context, R.color.e_accent))

                        .setCustomContentView(buildChronometer(pname, base, true, stateText));



        for (Action action : actions) {
@@ -297,7 +296,7 @@ class TimerNotificationBuilder { 
                        .setSortKey(nm.getTimerNotificationMissedSortKey())

                        .setStyle(new NotificationCompat.DecoratedCustomViewStyle())

                        .addAction(action)

                        .setColor(ThemeUtils.resolveColor(context, R.attr.colorSurface))

                        .setColor(ContextCompat.getColor(context, R.color.e_accent))

                        .setCustomContentView(buildChronometer(pname, base, true, stateText))

                        .setGroup(nm.getTimerNotificationGroupKey());