Huge rewrite of the AlarmClock to play the Alarm in a service.

The AlarmKlaxon has been converted to a service that plays the alarm and
vibrates the device. The AlarmAlert now just shows the UI for the alarm and
allows the user to snooze or dismiss the alarm. The snooze button must be
pressed in order to snooze the alarm. Volume and Camera buttons dismiss the
alarm while other buttons have their original behavior.

Each alarm triggers a notification that the alarm has fired. This allows another
activity (say, the Calendar alert #1908616) to play on top of the AlarmAlert.
The AlarmKlaxon service will continue to play even though the alert has been
dismissed. The user can get back to the UI through the notification.

If the user snoozes the alarm, the notification reflects that choice (#1691034)
and allows the user to cancel the snooze by clicking the notification. The
snoozed alarm takes priority over any other alarm (#1693155) so that it will
play unless the notification is clicked.

The database interaction has also been rewritten to use a Parcelable Alarm class
for sending and receiving the alarm data in a much simpler manner. This allows
for fewer database lookups since each activity no longer has to lookup the alarm
info.

The alarm silenced text has been removed from the AlarmAlert UI and moved to the
notification area. When an alarm is killed, the alert is dismissed and the
notification reflects the state. Clicking the notification launches the SetAlarm
activity so the user can see which alarm was killed.

1 files changed, 11 insertions, 11 deletions

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6cc24d1b0..852d50056 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -61,10 +61,6 @@
     <!-- Setting labels on Set alarm screen: Set time  -->
     <string name="time">Time</string>
 
-
-    <!-- Title of the alarm alert -->
-    <string name="alert_title">Alarm</string>
-    
     <!-- Button labels on the alarm dialog: Dismiss -->
     <string name="alarm_alert_dismiss_text">Dismiss</string>
 
@@ -80,13 +76,6 @@
          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>
 
-    <!-- Toast that appears after Alarm is snoozed from the Alarm
-         dialog. Shown if snooze cannot be set because the next alarm
-         would fire before the snooze alrm.  "Snooze not set - next
-         alarm set for xxx."  -->
-    <string name="alarm_alert_snooze_not_set">Snooze not set -- next alarm set for <xliff:g id="time">%s</xliff:g></string>
-
-
     <!-- Alarm confirmation toast: Describes how long from now until
          alarm fires -->
     <string name="alarm_set">This alarm is set for <xliff:g id="time_delta">%s</xliff:g> from now.</string>
@@ -202,6 +191,17 @@
 
     <!-- Summary for the alarm preference when silent is chosen. -->
     <string name="silent_alarm_summary">Silent</string>
+
+    <!-- Text to display in the small text of the notification -->
+    <string name="alarm_notify_text">Select to snooze or dismiss this alarm.</string>
+
+    <!-- Text to display in the notification ticker and label -->
+    <string name="alarm_notify_snooze_label"><xliff:g id="label">%s</xliff:g>
+      (snoozed)</string>
+
+    <!-- Text to display in the notification when the alarm has been snoozed -->
+    <string name="alarm_notify_snooze_text">Alarm set for <xliff:g
+        id="time">%s</xliff:g>. Click to cancel.</string>
 </resources>