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

Commit d63763d2 authored by Christine Franks's avatar Christine Franks Committed by Android (Google) Code Review
Browse files

Merge "Change snooze notification to 'Dismiss'." into ub-deskclock-gatling

parents 2ad58cf3 5cfd2d32

res/values/strings.xml

+0 −3
Original line number Diff line number Diff line
@@ -53,9 +53,6 @@ 
    <!-- Button labels on the alarm dialog: Dismiss -->

    <string name="alarm_alert_dismiss_text">Dismiss</string>



    <!-- Button labels on the pre-dismiss alarm notifications: Dismiss now -->

    <string name="alarm_alert_dismiss_now_text">Dismiss now</string>



    <!-- Alarm Alert screen: this message is shown after an alarm rung

         unattended for a number of minutes.  It tells the user that

         the alarm has been silenced.-->

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

+2 −2
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ public final class AlarmNotifications { 
        Intent dismissIntent = AlarmStateManager.createStateChangeIntent(context,

                AlarmStateManager.ALARM_DISMISS_TAG, instance, AlarmInstance.PREDISMISSED_STATE);

        notification.addAction(R.drawable.ic_alarm_off_24dp,

                context.getString(R.string.alarm_alert_dismiss_now_text),

                context.getString(R.string.alarm_alert_dismiss_text),

                PendingIntent.getService(context, instance.hashCode(),

                        dismissIntent, PendingIntent.FLAG_UPDATE_CURRENT));
@@ -146,7 +146,7 @@ public final class AlarmNotifications { 
        Intent dismissIntent = AlarmStateManager.createStateChangeIntent(context,

                AlarmStateManager.ALARM_DISMISS_TAG, instance, AlarmInstance.PREDISMISSED_STATE);

        notification.addAction(R.drawable.ic_alarm_off_24dp,

                context.getString(R.string.alarm_alert_dismiss_now_text),

                context.getString(R.string.alarm_alert_dismiss_text),

                PendingIntent.getService(context, instance.hashCode(),

                        dismissIntent, PendingIntent.FLAG_UPDATE_CURRENT));

src/com/android/deskclock/alarms/dataadapter/AlarmItemViewHolder.java

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ public abstract class AlarmItemViewHolder extends ItemAdapter.ItemViewHolder<Ala 
            final String dismissText = alarm.instanceState == AlarmInstance.SNOOZE_STATE

                    ? context.getString(R.string.alarm_alert_snooze_until,

                            AlarmUtils.getAlarmText(context, alarmInstance, false))

                    : context.getString(R.string.alarm_alert_dismiss_now_text);

                    : context.getString(R.string.alarm_alert_dismiss_text);

            preemptiveDismissButton.setText(dismissText);

            preemptiveDismissButton.setClickable(true);

        } else {