Fix snooze message.
Bug: 11255815
Change-Id: I8cdbe04fa65f7bb97057bf72a2d87ef466cae0bf
(cherry picked from commit 0d784080acf4d655ef3b7435d1711937f8bbdd7c)
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a8e33f5..134f700 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -96,7 +96,12 @@
<!-- Toast that appears after Alarm is snoozed from the Alarm
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. -->
<string name="alarm_alert_snooze_until">Snoozing until <xliff:g id="time">%s</xliff:g></string>
diff --git a/src/com/android/deskclock/alarms/AlarmStateManager.java b/src/com/android/deskclock/alarms/AlarmStateManager.java
index 4ae2385..c6562e8 100644
--- a/src/com/android/deskclock/alarms/AlarmStateManager.java
+++ b/src/com/android/deskclock/alarms/AlarmStateManager.java
@@ -378,7 +378,8 @@
instance, AlarmInstance.FIRED_STATE);
// 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();
// Instance time changed, so find next alarm that will fire and notify system
