diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2009-02-19 10:57:36 -0800 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-02-19 10:57:36 -0800 |
commit | 477296898777d0bdf41fc49c047a6b9374f27fe1 (patch) | |
tree | ceeaa6b84892801d426ba3792238a1993ae73ff5 /src/com/android/settings/ConfirmLockPattern.java | |
parent | b9f5851434b568fa427613fbc00e0b4cf9e15132 (diff) | |
download | packages_apps_settings-477296898777d0bdf41fc49c047a6b9374f27fe1.zip packages_apps_settings-477296898777d0bdf41fc49c047a6b9374f27fe1.tar.gz packages_apps_settings-477296898777d0bdf41fc49c047a6b9374f27fe1.tar.bz2 |
auto import from //branches/cupcake/...@132276
Diffstat (limited to 'src/com/android/settings/ConfirmLockPattern.java')
-rw-r--r-- | src/com/android/settings/ConfirmLockPattern.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/ConfirmLockPattern.java index c94bbb2..44baccc 100644 --- a/src/com/android/settings/ConfirmLockPattern.java +++ b/src/com/android/settings/ConfirmLockPattern.java @@ -103,6 +103,7 @@ public class ConfirmLockPattern extends Activity { mFooterWrongText = intent.getCharSequenceExtra(FOOTER_WRONG_TEXT); } + mLockPatternView.setTactileFeedbackEnabled(mLockPatternUtils.isTactileFeedbackEnabled()); mLockPatternView.setOnPatternListener(mConfirmExistingLockPatternListener); updateStage(Stage.NeedToUnlock); @@ -220,10 +221,9 @@ public class ConfirmLockPattern extends Activity { setResult(RESULT_OK); finish(); } else { - if (pattern.size() >= LockPatternUtils.MIN_LOCK_PATTERN_SIZE && + if (pattern.size() >= LockPatternUtils.MIN_PATTERN_REGISTER_FAIL && ++mNumWrongConfirmAttempts >= LockPatternUtils.FAILED_ATTEMPTS_BEFORE_TIMEOUT) { - long deadline = SystemClock.elapsedRealtime() + LockPatternUtils.FAILED_ATTEMPT_TIMEOUT_MS; - mLockPatternUtils.setLockoutAttemptDeadline(deadline); + long deadline = mLockPatternUtils.setLockoutAttemptDeadline(); handleAttemptLockout(deadline); } else { updateStage(Stage.NeedToUnlockWrong); |