diff options
| author | David van Tonder <david.vantonder@gmail.com> | 2013-07-02 10:50:16 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-07-02 10:50:16 -0700 |
| commit | 7c2666af7732d33d216b6ca2725896f82b6f3607 (patch) | |
| tree | 2bda165b3dfec836b44594ac8784be1df2f68297 /res | |
| parent | 0f0aab9bbad27d9454ff874032574d00c980d3fe (diff) | |
| parent | 5d68d4bf506b539ea9027cad638eaba211155969 (diff) | |
| download | packages_apps_Settings-7c2666af7732d33d216b6ca2725896f82b6f3607.tar.gz packages_apps_Settings-7c2666af7732d33d216b6ca2725896f82b6f3607.tar.bz2 packages_apps_Settings-7c2666af7732d33d216b6ca2725896f82b6f3607.zip | |
Merge "Add an option to allow a (subtle) notification vibration during calls." into cm-10.1
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/cm_strings.xml | 4 | ||||
| -rw-r--r-- | res/xml/sound_settings.xml | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 1769df4bd..cf6d49def 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -105,6 +105,10 @@ <string name="notification_convert_sound_to_vibration_title">Vibrate on notification</string> <string name="notification_convert_sound_to_vibration_summary">In vibrate mode, all notifications will vibrate regardless of individual app settings</string> + <!-- vibrate during phone calls --> + <string name="notification_vibrate_during_calls_title">Vibrate during call</string> + <string name="notification_vibrate_during_calls_summary">Incoming notifications will softly vibrate during phone calls</string> + <!-- Hostname setting --> <string name="device_hostname">Device hostname</string> diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml index b55263430..116855a71 100644 --- a/res/xml/sound_settings.xml +++ b/res/xml/sound_settings.xml @@ -128,6 +128,13 @@ android:summary="@string/notification_convert_sound_to_vibration_summary" android:defaultValue="true" /> + <CheckBoxPreference + android:key="notification_vibrate_during_calls" + android:title="@string/notification_vibrate_during_calls_title" + android:summary="@string/notification_vibrate_during_calls_summary" + android:persistent="false" + android:defaultValue="false" /> + <!-- Dock --> <PreferenceCategory android:key="dock_category" |