diff options
| author | Jake Hamby <jhamby@google.com> | 2012-08-24 16:55:28 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-27 12:33:27 -0700 |
| commit | bf70b6f871ac58439b5e98a305478a773e872b68 (patch) | |
| tree | 9d35063d489e84d3e895d27b39ab4c37a0dde91f /res/values | |
| parent | a93243d13ef0c0b29d871d483642e39c01db7c26 (diff) | |
| download | android_packages_apps_CellBroadcastReceiver-bf70b6f871ac58439b5e98a305478a773e872b68.tar.gz android_packages_apps_CellBroadcastReceiver-bf70b6f871ac58439b5e98a305478a773e872b68.tar.bz2 android_packages_apps_CellBroadcastReceiver-bf70b6f871ac58439b5e98a305478a773e872b68.zip | |
Fix behavior of CMAS audio alert and vibration.
Fix bugs in CMAS audio alert and vibration behavior:
* Use audio duration of 10.5 seconds for all CMAS alerts.
* Fix vibration cadence to match CMAS tone cadence.
* Mute audio when volume or camera keys are pressed.
* Don't play audio or vibration in silent mode.
* Don't play audio in vibrate mode.
* Use notification volume rather than alarm volume.
* Catch IllegalStateExceptions when stopping audio/TTS (sometimes
throws "Unable to retrieve AudioTrack pointer for stop()").
* Add Vibrate setting to CMAS settings for disabling vibration.
Bug: 7045214
Change-Id: Id98ea4f42f326b9a253407b9bbe67ca6acc6a20c
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/strings.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 1c985049..e3714bab 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -123,6 +123,11 @@ <!-- Preference summary for enable CMAS test alerts checkbox. [CHAR LIMIT=100] --> <string name="enable_cmas_test_alerts_summary">Display test broadcasts for Commercial Mobile Alert System</string> + <!-- Preference title for CMAS vibration on/off. [CHAR LIMIT=30] --> + <string name="enable_alert_vibrate_title">Vibrate</string> + <!-- Preference summary for CMAS vibration on/off. [CHAR LIMIT=60] --> + <string name="enable_alert_vibrate_summary">Vibrate on alert</string> + <!-- Preference category title for Brazil settings. [CHAR LIMIT=50] --> <string name="category_brazil_settings_title">Settings for Brazil</string> <!-- Preference title for enable channel 50 alerts (Brazil only). [CHAR LIMIT=30] --> |