auto import from //branches/cupcake/...@132276

This commit is contained in:
The Android Open Source Project
2009-02-19 10:57:36 -08:00
parent b9f5851434
commit 4772968987
64 changed files with 1990 additions and 2455 deletions

View File

@@ -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);