diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-10-10 16:27:26 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-10 16:27:27 -0700 |
| commit | 2264a64331b39b0770b72a71a453601cc1b9b9ac (patch) | |
| tree | fb8e14f14dbf1049a91ec9e1f6cf29bc0c93b94d /res | |
| parent | af0cea0a2148f8915a57c50a571636911feed9d3 (diff) | |
| parent | e656031ff8c48dffafe965b5859c5c82a5f23fe7 (diff) | |
| download | packages_apps_settings-2264a64331b39b0770b72a71a453601cc1b9b9ac.zip packages_apps_settings-2264a64331b39b0770b72a71a453601cc1b9b9ac.tar.gz packages_apps_settings-2264a64331b39b0770b72a71a453601cc1b9b9ac.tar.bz2 | |
Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/xml/security_settings_biometric_weak.xml | 4 | ||||
| -rw-r--r-- | res/xml/security_settings_pattern.xml | 4 | ||||
| -rw-r--r-- | res/xml/security_settings_pin.xml | 4 |
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" |