From 4589e8a8dde484424a96d4644772d793043ad029 Mon Sep 17 00:00:00 2001 From: Jake Hamby Date: Tue, 26 Feb 2013 17:05:00 -0800 Subject: Add CMAS reminder alert feature. Carrier requirement: add "alert reminder" feature for CMAS alerts. If the alert is not dismissed, a reminder sound is played based on user preference. The user can select one of the following behaviors: - "Once" = one alert reminder after 2 minutes - "Every 2 minutes" - "Every 15 minutes" - "Off" = no alert reminders The notification sound is the user's preferred notification sound, or the user's preferred alarm sound as a fallback. Bug: 7045215 Change-Id: Id7858a11dd9b2227aea8ea4a826ed0e78c1ffcb6 --- AndroidManifest.xml | 3 + res/values/strings.xml | 21 +++ res/xml/preferences.xml | 7 + .../CellBroadcastAlertAudio.java | 54 +++++-- .../CellBroadcastAlertFullScreen.java | 6 + .../CellBroadcastAlertReminder.java | 173 +++++++++++++++++++++ .../CellBroadcastSettings.java | 17 +- 7 files changed, 269 insertions(+), 12 deletions(-) create mode 100644 src/com/android/cellbroadcastreceiver/CellBroadcastAlertReminder.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 92fda98b..921fe4ac 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -43,6 +43,9 @@ + + diff --git a/res/values/strings.xml b/res/values/strings.xml index 0a9b3870..21ed1904 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -93,6 +93,10 @@ Alert sound duration + + Alert reminder + + Speak alert message @@ -243,4 +247,21 @@ 8 10 + + + + Once + Every 2 minutes + Every 15 minutes + Off + + + + + 1 + 2 + 15 + 0 + diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 340830a8..8d3b1fa2 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -52,6 +52,13 @@ android:defaultValue="4" android:dialogTitle="@string/alert_sound_duration_title" /> + +