PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix 2448345: Fix tactile feedback bug in password/PIN and pattern unlock."

Browse Source
This commit is contained in:
Jim Miller
2010-02-19 18:18:19 -08:00
committed by Android (Google) Code Review
parent ad1482712d 9e61b9fe59
commit d814bb7309
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/SecuritySettings.java
View File

@@ -71,7 +71,7 @@ public class SecuritySettings extends PreferenceActivity {
private static final String KEY_LOCK_ENABLED = "lockenabled"; private static final String KEY_LOCK_ENABLED = "lockenabled";
private static final String KEY_VISIBLE_PATTERN = "visiblepattern"; 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 String KEY_UNLOCK_METHOD = "unlock_method";
private static final int UPDATE_PASSWORD_REQUEST = 56; private static final int UPDATE_PASSWORD_REQUEST = 56;
private static final int CONFIRM_EXISTING_REQUEST = 57; private static final int CONFIRM_EXISTING_REQUEST = 57;
@@ -285,13 +285,10 @@ public class SecuritySettings extends PreferenceActivity {
super.onResume(); super.onResume();
final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils(); final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils();
boolean patternExists = lockPatternUtils.savedPatternExists();
if (mVisiblePattern != null) { if (mVisiblePattern != null) {
mVisiblePattern.setEnabled(patternExists);
mVisiblePattern.setChecked(lockPatternUtils.isVisiblePatternEnabled()); mVisiblePattern.setChecked(lockPatternUtils.isVisiblePatternEnabled());
} }
if (mTactileFeedback != null) { if (mTactileFeedback != null) {
mTactileFeedback.setEnabled(patternExists);
mTactileFeedback.setChecked(lockPatternUtils.isTactileFeedbackEnabled()); mTactileFeedback.setChecked(lockPatternUtils.isTactileFeedbackEnabled());
} }