diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-11-30 19:08:33 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-30 19:08:33 -0800 |
| commit | 827c3d6943f7cdc3ddbe40551f813e6865595e50 (patch) | |
| tree | 90df2d0566856bd676782bf8ed62c582cebf4bb1 /res/xml | |
| parent | 7129322d0685059e925fc692ef9b1c48c5ff3128 (diff) | |
| parent | 95b26e1a4ae1d3bbef8811202e8aec3772f3bbe5 (diff) | |
| download | packages_apps_Settings-827c3d6943f7cdc3ddbe40551f813e6865595e50.zip packages_apps_Settings-827c3d6943f7cdc3ddbe40551f813e6865595e50.tar.gz packages_apps_Settings-827c3d6943f7cdc3ddbe40551f813e6865595e50.tar.bz2 | |
am 95b26e1a: Merge "Overhaul vibrate and silent settings to match hard keys." into ics-mr1
* commit '95b26e1a4ae1d3bbef8811202e8aec3772f3bbe5':
Overhaul vibrate and silent settings to match hard keys.
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"/> |