diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-11-30 19:04:33 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-30 19:04:33 -0800 |
| commit | 95b26e1a4ae1d3bbef8811202e8aec3772f3bbe5 (patch) | |
| tree | 9af17103d818d54e5019a485d2136b35da3684ca /res/xml | |
| parent | a6ff69ede0fa9868464a1a7059cad8fb3838c5ab (diff) | |
| parent | dfb654367d4b65fb45089cd8d7d0905e3cd68ae3 (diff) | |
| download | packages_apps_Settings-95b26e1a4ae1d3bbef8811202e8aec3772f3bbe5.zip packages_apps_Settings-95b26e1a4ae1d3bbef8811202e8aec3772f3bbe5.tar.gz packages_apps_Settings-95b26e1a4ae1d3bbef8811202e8aec3772f3bbe5.tar.bz2 | |
Merge "Overhaul vibrate and silent settings to match hard keys." into ics-mr1
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/sound_settings.xml | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml index fc6fdf5..a61e0e1 100644 --- a/res/xml/sound_settings.xml +++ b/res/xml/sound_settings.xml @@ -27,16 +27,10 @@ android:streamType="ring" /> <ListPreference - android:key="vibrate" - android:title="@string/vibrate_title" - android:entries="@array/vibrate_entries" - android:entryValues="@array/vibrate_values" /> - - <CheckBoxPreference - android:key="silent" + android:key="silent_mode" android:title="@string/silent_mode_title" - android:persistent="false" - /> + android:entries="@array/silent_mode_entries" + android:entryValues="@array/silent_mode_values" /> <Preference android:key="musicfx" @@ -64,6 +58,11 @@ android:persistent="false" android:ringtoneType="notification" /> + <CheckBoxPreference + android:key="vibrate_on_ring" + android:title="@string/vibrate_on_ring_title" + android:defaultValue="false" /> + <PreferenceCategory android:title="@string/sound_category_feedback_title"/> |