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

Commit 6690bbd9 authored by Isaac Katzenelson's avatar Isaac Katzenelson Committed by Android (Google) Code Review
Browse files

Merge "Fix snooze message." into klp-dev

parents 8bc4be3d ef5ac869

res/values/strings.xml

+6 −1
Original line number Original line Diff line number Diff line
@@ -96,7 +96,12 @@ 




    <!-- Toast that appears after Alarm is snoozed from the Alarm

    <!-- Toast that appears after Alarm is snoozed from the Alarm

         dialog. Says the alarm will snooze for xxx minutes.  -->

         dialog. Says the alarm will snooze for xxx minutes.  -->

    <string name="alarm_alert_snooze_set">Snoozing for <xliff:g id="minutes">%d</xliff:g> minutes.</string>

    <plurals name="alarm_alert_snooze_set">

        <!-- Duration for one minute -->

        <item quantity="one">Snoozing for 1 minute.</item>

        <!-- Duration for more than one minute -->

        <item quantity="other">Snoozing for <xliff:g id="minutes">%d</xliff:g> minutes.</item>

    </plurals>





    <!-- Text to appear inside a notification while an alarm is snoozing. -->

    <!-- Text to appear inside a notification while an alarm is snoozing. -->

    <string name="alarm_alert_snooze_until">Snoozing until <xliff:g id="time">%s</xliff:g></string>

    <string name="alarm_alert_snooze_until">Snoozing until <xliff:g id="time">%s</xliff:g></string>

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -378,7 +378,8 @@ public final class AlarmStateManager extends BroadcastReceiver { 
                instance, AlarmInstance.FIRED_STATE);

                instance, AlarmInstance.FIRED_STATE);





        // Display the snooze minutes in a toast.

        // Display the snooze minutes in a toast.

        String displayTime = context.getString(R.string.alarm_alert_snooze_set, snoozeMinutes);

        String displayTime = String.format(context.getResources().getQuantityText

                (R.plurals.alarm_alert_snooze_set, snoozeMinutes).toString(), snoozeMinutes);

        Toast.makeText(context, displayTime, Toast.LENGTH_LONG).show();

        Toast.makeText(context, displayTime, Toast.LENGTH_LONG).show();





        // Instance time changed, so find next alarm that will fire and notify system

        // Instance time changed, so find next alarm that will fire and notify system