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 | |
| parent | a6ff69ede0fa9868464a1a7059cad8fb3838c5ab (diff) | |
| parent | dfb654367d4b65fb45089cd8d7d0905e3cd68ae3 (diff) | |
| download | packages_apps_Settings-95b26e1a4ae1d3bbef8811202e8aec3772f3bbe5.tar.gz packages_apps_Settings-95b26e1a4ae1d3bbef8811202e8aec3772f3bbe5.tar.bz2 packages_apps_Settings-95b26e1a4ae1d3bbef8811202e8aec3772f3bbe5.zip | |
Merge "Overhaul vibrate and silent settings to match hard keys." into ics-mr1
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/arrays.xml | 22 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | res/xml/sound_settings.xml | 17 |
3 files changed, 19 insertions, 22 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 0b8d7bb98..97c6d990e 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -550,20 +550,18 @@ <item>auto</item> </string-array> - <!-- New incoming call vibrate options. --> - <string-array name="vibrate_entries"> - <item>Always</item> - <item>Never</item> - <item>Only in Silent mode</item> - <item>Only when not in Silent mode</item> + <!-- Silent mode options. --> + <string-array name="silent_mode_entries"> + <item>Off</item> + <item>Vibrate</item> + <item>Mute</item> </string-array> - <!-- Values for vibrate_entries matching constants in SoundSettings. Do not translate. --> - <string-array name="vibrate_values" translatable="false"> - <item>always</item> - <item>never</item> - <item>silent</item> - <item>notsilent</item> + <!-- Values for Silent mode. Do not translate. --> + <string-array name="silent_mode_values" translatable="false"> + <item>off</item> + <item>vibrate</item> + <item>mute</item> </string-array> <!-- Titles for the list of long press timeout options. --> diff --git a/res/values/strings.xml b/res/values/strings.xml index fcecb8fff..bca1d090d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1511,7 +1511,7 @@ <!-- Sound settings screen, setting option name checkbox --> <string name="vibrate_in_silent_title">Vibrate when silent</string> <!-- Sound settings screen, setting option name checkbox --> - <string name="vibrate_title">Vibrate</string> + <string name="vibrate_on_ring_title">Vibrate and ring</string> <!-- Sound settings screen, setting option name --> <string name="notification_sound_title">Default notification</string> <!-- Sound settings screen, notification light repeat pulsing title --> diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml index fc6fdf5d8..a61e0e11f 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"/> |