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

Commit 0b316de0 authored by Dan Pasanen's avatar Dan Pasanen Committed by Michael Bestas
Browse files

Revert "DeskClock: introduce low priority alarm notification channel" 

This reverts commit c0552a2b.

Change-Id: I50305980aaeb6c888749aa45e591d53a830c57ca
parent 156e5cd8

res/values/strings.xml

+1 −2
Original line number Diff line number Diff line
@@ -1055,7 +1055,6 @@ 
    <string name="stopwatch_channel_name">Stopwatch</string>

    <!-- The user visible name of the timers channel. -->

    <string name="timer_channel_name">Timers</string>

    <!-- The user visible names of the alarm channels. -->

    <!-- The user visible name of the alarms channel. -->

    <string name="alarm_channel_name">Alarms</string>

    <string name="alarm_channel_low_priority_name">Alarm information</string>

</resources>

src/com/android/deskclock/Utils.java

+0 −9
Original line number Diff line number Diff line
@@ -639,10 +639,6 @@ public class Utils { 


        NotificationChannel channel = new NotificationChannel(id, name, importance);



        if (ALARM_CHANNEL_LOW_PRIORITY.equals(name)) {

            channel.setVibrationPattern(null);

        }



        manager.createNotificationChannel(channel);

    }
@@ -651,8 +647,6 @@ public class Utils { 
    public static final String STOPWATCH_CHANNEL = "stopwatch_notification_channel";

    public static final String TIMER_CHANNEL = "timer_notification_channel";

    public static final String ALARM_CHANNEL = "alarm_notification_channel";

    public static final String ALARM_CHANNEL_LOW_PRIORITY =

                                               "alarm_notification_channel_low_priority";



    public static void createNotificationChannelsIfNeeded(Context context) {

        if (areNotificationChannelsCreated) {
@@ -670,8 +664,5 @@ public class Utils { 
        createNotificationChannel(context, ALARM_CHANNEL,

                context.getString(R.string.alarm_channel_name),

                NotificationManager.IMPORTANCE_HIGH);

        createNotificationChannel(context, ALARM_CHANNEL_LOW_PRIORITY,

                context.getString(R.string.alarm_channel_low_priority_name),

                NotificationManager.IMPORTANCE_MIN);

    }

}

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

+1 −2
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ final class AlarmNotifications { 
        Utils.createNotificationChannelsIfNeeded(context);



        Notification.Builder builder = new Notification.Builder(context,

                    Utils.ALARM_CHANNEL_LOW_PRIORITY)

                    Utils.ALARM_CHANNEL)

                .setShowWhen(false)

                .setContentTitle(context.getString(

                        R.string.alarm_alert_predismiss_title))
@@ -98,7 +98,6 @@ final class AlarmNotifications { 
                .setSortKey(createSortKey(instance))

                .setCategory(Notification.CATEGORY_ALARM)

                .setVisibility(Notification.VISIBILITY_PUBLIC)

                .setOngoing(true)

                .setLocalOnly(true);



        if (Utils.isNOrLater()) {