diff options
| author | Jim Miller <jaggies@google.com> | 2010-02-19 18:18:19 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-02-19 18:18:19 -0800 |
| commit | d814bb7309f052a0b242047ab9a9cdcbaffc6671 (patch) | |
| tree | c6019b3e157c884b0226c4b2a641e7a84823f86c /src/com | |
| parent | ad1482712de6e7cac803ed02abcdc2efb47d43ba (diff) | |
| parent | 9e61b9fe59aca9ac521792f4f89e5a270333b030 (diff) | |
| download | packages_apps_settings-d814bb7309f052a0b242047ab9a9cdcbaffc6671.zip packages_apps_settings-d814bb7309f052a0b242047ab9a9cdcbaffc6671.tar.gz packages_apps_settings-d814bb7309f052a0b242047ab9a9cdcbaffc6671.tar.bz2 | |
Merge "Fix 2448345: Fix tactile feedback bug in password/PIN and pattern unlock."
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/settings/SecuritySettings.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index fb2f6c9..5b60c45 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -71,7 +71,7 @@ public class SecuritySettings extends PreferenceActivity { private static final String KEY_LOCK_ENABLED = "lockenabled"; private static final String KEY_VISIBLE_PATTERN = "visiblepattern"; - private static final String KEY_TACTILE_FEEDBACK_ENABLED = "tactilefeedback"; + private static final String KEY_TACTILE_FEEDBACK_ENABLED = "unlock_tactile_feedback"; private static final String KEY_UNLOCK_METHOD = "unlock_method"; private static final int UPDATE_PASSWORD_REQUEST = 56; private static final int CONFIRM_EXISTING_REQUEST = 57; @@ -285,13 +285,10 @@ public class SecuritySettings extends PreferenceActivity { super.onResume(); final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils(); - boolean patternExists = lockPatternUtils.savedPatternExists(); if (mVisiblePattern != null) { - mVisiblePattern.setEnabled(patternExists); mVisiblePattern.setChecked(lockPatternUtils.isVisiblePatternEnabled()); } if (mTactileFeedback != null) { - mTactileFeedback.setEnabled(patternExists); mTactileFeedback.setChecked(lockPatternUtils.isTactileFeedbackEnabled()); } |