diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-11-29 16:38:14 -0800 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2011-11-30 18:46:54 -0800 |
| commit | dfb654367d4b65fb45089cd8d7d0905e3cd68ae3 (patch) | |
| tree | b24de480c3bf8aa9ee3a2c0ab3623fd7081cacbc /res/xml | |
| parent | 2fa017f874d20a5b037ebe57f3fc0c53964080bc (diff) | |
| download | packages_apps_settings-dfb654367d4b65fb45089cd8d7d0905e3cd68ae3.zip packages_apps_settings-dfb654367d4b65fb45089cd8d7d0905e3cd68ae3.tar.gz packages_apps_settings-dfb654367d4b65fb45089cd8d7d0905e3cd68ae3.tar.bz2 | |
Overhaul vibrate and silent settings to match hard keys.
We go back to the old style of toggling between Mute/Vibrate/Normal.
There is an addition of a checkbox to indicate Vibrate on ring/notif.
Icons in volume dialogs are no longer touchable.
Bug: 5586083
This simplifies the logic in SoundSettings quite a bit, since there's a 1-1 mapping
with ringer mode.
Don't disable volume sliders when muted, so you can go to zero and back up by sliding
your finger. This is because the icons are not clickable anymore.
Change-Id: Ia7ce7e1bf108419eb107f03b7720101efe1598b1
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"/> |