diff options
| author | Daniel Sandler <dsandler@google.com> | 2010-03-01 17:17:08 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-01 17:17:08 -0800 |
| commit | 385a9e52be6f3a6014d6aaca06a800289e90b528 (patch) | |
| tree | 64f1b8cf327255465e80a002de40c77e5f7fe8c9 /res/xml | |
| parent | 23c28c21084b74c05dce93a7bcbddc4413601800 (diff) | |
| parent | 58cf8299d3ef347e3fd154b1439f50e62f7ca8bf (diff) | |
| download | packages_apps_Settings-385a9e52be6f3a6014d6aaca06a800289e90b528.zip packages_apps_Settings-385a9e52be6f3a6014d6aaca06a800289e90b528.tar.gz packages_apps_Settings-385a9e52be6f3a6014d6aaca06a800289e90b528.tar.bz2 | |
Merge "Support new vibrate/silent behavior."
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/sound_settings.xml | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml index e4d80e6..8632871 100644 --- a/res/xml/sound_settings.xml +++ b/res/xml/sound_settings.xml @@ -27,6 +27,13 @@ android:order="1" android:disableDependentsState="true" /> + <CheckBoxPreference + android:key="vibrate_in_silent" + android:title="@string/vibrate_in_silent_title" + android:summary="@string/vibrate_in_silent_summary" + android:order="2" + android:persistent="false" /> + <com.android.settings.RingerVolumePreference android:key="ring_volume" android:title="@string/all_volume_title" @@ -34,7 +41,7 @@ android:dialogTitle="@string/all_volume_title" android:persistent="false" android:dependency="silent" - android:order="2" + android:order="3" android:streamType="ring" /> <com.android.settings.DefaultRingtonePreference @@ -47,12 +54,13 @@ android:order="5" android:ringtoneType="ringtone" /> - <CheckBoxPreference + <ListPreference android:key="vibrate" + android:order="6" android:title="@string/vibrate_title" android:summary="@string/vibrate_summary" - android:order="6" - android:persistent="false" /> + android:entries="@array/vibrate_entries" + android:entryValues="@array/vibrate_values" /> <com.android.settings.DefaultRingtonePreference android:key="notification_sound" |