summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2011-11-30 19:08:33 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-30 19:08:33 -0800
commit827c3d6943f7cdc3ddbe40551f813e6865595e50 (patch)
tree90df2d0566856bd676782bf8ed62c582cebf4bb1 /res
parent7129322d0685059e925fc692ef9b1c48c5ff3128 (diff)
parent95b26e1a4ae1d3bbef8811202e8aec3772f3bbe5 (diff)
downloadpackages_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')
-rw-r--r--res/values/arrays.xml22
-rw-r--r--res/values/strings.xml2
-rw-r--r--res/xml/sound_settings.xml17
3 files changed, 19 insertions, 22 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 0b8d7bb..97c6d99 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 b9fe1b4..7149abb 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 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"/>