summaryrefslogtreecommitdiffstats
path: root/res/xml
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2012-10-10 14:27:35 -0700
committerJeff Sharkey <jsharkey@android.com>2012-10-10 15:38:58 -0700
commite656031ff8c48dffafe965b5859c5c82a5f23fe7 (patch)
tree2a4badbffb7b6a90c1c23830305fc35f07207533 /res/xml
parent33080be20a58d340f860feed444167edb527d689 (diff)
downloadpackages_apps_settings-e656031ff8c48dffafe965b5859c5c82a5f23fe7.zip
packages_apps_settings-e656031ff8c48dffafe965b5859c5c82a5f23fe7.tar.gz
packages_apps_settings-e656031ff8c48dffafe965b5859c5c82a5f23fe7.tar.bz2
Move lockscreen to using haptic feedback setting.
This removes lockscreen-specific "Vibrate on touch" setting, and changes it to use the haptic feedback setting instead. Bug: 7318772 Change-Id: Id6931903b3ebeca6aeacef9b127490a381cd40b4
Diffstat (limited to 'res/xml')
-rw-r--r--res/xml/security_settings_biometric_weak.xml4
-rw-r--r--res/xml/security_settings_pattern.xml4
-rw-r--r--res/xml/security_settings_pin.xml4
3 files changed, 0 insertions, 12 deletions
diff --git a/res/xml/security_settings_biometric_weak.xml b/res/xml/security_settings_biometric_weak.xml
index c95596b..566f8c2 100644
--- a/res/xml/security_settings_biometric_weak.xml
+++ b/res/xml/security_settings_biometric_weak.xml
@@ -51,10 +51,6 @@
android:key="power_button_instantly_locks"
android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>
- <CheckBoxPreference
- android:key="unlock_tactile_feedback"
- android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/>
-
<PreferenceScreen
android:key="choose_lockscreen_status_widget"
android:title="@string/choose_lockscreen_status_widget_picker_title"
diff --git a/res/xml/security_settings_pattern.xml b/res/xml/security_settings_pattern.xml
index 47fa1cc..b764c13 100644
--- a/res/xml/security_settings_pattern.xml
+++ b/res/xml/security_settings_pattern.xml
@@ -42,10 +42,6 @@
android:key="power_button_instantly_locks"
android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>
- <CheckBoxPreference
- android:key="unlock_tactile_feedback"
- android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/>
-
<PreferenceScreen
android:key="choose_lockscreen_status_widget"
android:title="@string/choose_lockscreen_status_widget_picker_title"
diff --git a/res/xml/security_settings_pin.xml b/res/xml/security_settings_pin.xml
index a019125..f0aacaa 100644
--- a/res/xml/security_settings_pin.xml
+++ b/res/xml/security_settings_pin.xml
@@ -38,10 +38,6 @@
android:key="power_button_instantly_locks"
android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>
- <CheckBoxPreference
- android:key="unlock_tactile_feedback"
- android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/>
-
<PreferenceScreen
android:key="choose_lockscreen_status_widget"
android:title="@string/choose_lockscreen_status_widget_picker_title"