summaryrefslogtreecommitdiffstats
path: root/res/xml
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2010-02-18 06:21:03 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-02-18 06:21:03 -0800
commit1b35d6dbaea08dbd2f20a5e5769b292c324d8ba7 (patch)
tree5810113ef410b29cc84910fb9463eb98d9a398ba /res/xml
parentc8fd872e56c90086df5998aa385e7bece860df00 (diff)
parent231d880df31ea4817dc0c5f1acd66f12417f2044 (diff)
downloadpackages_apps_settings-1b35d6dbaea08dbd2f20a5e5769b292c324d8ba7.zip
packages_apps_settings-1b35d6dbaea08dbd2f20a5e5769b292c324d8ba7.tar.gz
packages_apps_settings-1b35d6dbaea08dbd2f20a5e5769b292c324d8ba7.tar.bz2
Merge "Checkbox (in Sound settings) to control new lockscreen sfx."
Diffstat (limited to 'res/xml')
-rw-r--r--res/xml/sound_settings.xml11
1 files changed, 10 insertions, 1 deletions
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index 08ce0d6..e4d80e6 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -90,11 +90,20 @@
android:defaultValue="true" />
<CheckBoxPreference
+ android:key="lock_sounds"
+ android:title="@string/lock_sounds_enable_title"
+ android:summaryOn="@string/lock_sounds_enable_summary_on"
+ android:summaryOff="@string/lock_sounds_enable_summary_off"
+ android:dependency="silent"
+ android:order="11"
+ android:defaultValue="true" />
+
+ <CheckBoxPreference
android:key="haptic_feedback"
android:title="@string/haptic_feedback_enable_title"
android:summaryOn="@string/haptic_feedback_enable_summary_on"
android:summaryOff="@string/haptic_feedback_enable_summary_off"
- android:order="11"
+ android:order="12"
android:defaultValue="true" />
<ListPreference