diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-12-19 19:58:13 +0100 |
|---|---|---|
| committer | Jorim Jaggi <jjaggi@google.com> | 2015-01-07 15:01:00 +0100 |
| commit | cd3b5b52ac227c4f69879102a31a22d0258002e6 (patch) | |
| tree | 18099f3aa2eb1242dc362f37a89ddf20d2ef4d8a /packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java | |
| parent | 8a8941aa1be01fbfca8c4540298cc5de12b6538b (diff) | |
| download | frameworks_base-cd3b5b52ac227c4f69879102a31a22d0258002e6.zip frameworks_base-cd3b5b52ac227c4f69879102a31a22d0258002e6.tar.gz frameworks_base-cd3b5b52ac227c4f69879102a31a22d0258002e6.tar.bz2 | |
Remove dead code #5: Remove KeyguardAccountView
Change-Id: I04431625e922e9554ce55b852bd8ee571049339b
Diffstat (limited to 'packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java index 50377c3..50a6adf 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java @@ -41,7 +41,6 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe private static final int USER_TYPE_SECONDARY_USER = 3; private KeyguardSecurityModel mSecurityModel; - private boolean mEnableFallback; // TODO: This should get the value from KeyguardPatternView private LockPatternUtils mLockPatternUtils; private KeyguardSecurityViewFlipper mSecurityViewFlipper; @@ -198,7 +197,6 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe messageId = R.string.kg_too_many_failed_password_attempts_dialog_message; break; // These don't have timeout dialogs. - case Account: case Invalid: case None: case SimPin: @@ -305,17 +303,6 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe } else { showTimeout = (failedAttempts % LockPatternUtils.FAILED_ATTEMPTS_BEFORE_TIMEOUT) == 0; - if (usingPattern && mEnableFallback) { - if (failedAttempts == failedAttemptWarning) { - showAlmostAtAccountLoginDialog(); - showTimeout = false; // don't show both dialogs - } else if (failedAttempts >= LockPatternUtils.FAILED_ATTEMPTS_BEFORE_RESET) { - mLockPatternUtils.setPermanentlyLocked(true); - showSecurityScreen(SecurityMode.Account); - // don't show timeout dialog because we show account unlock screen next - showTimeout = false; - } - } } monitor.reportFailedUnlockAttempt(); mLockPatternUtils.reportFailedPasswordAttempt(); @@ -377,7 +364,6 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe case Pattern: case Password: case PIN: - case Account: finish = true; break; @@ -522,7 +508,6 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe case Pattern: return R.id.keyguard_pattern_view; case PIN: return R.id.keyguard_pin_view; case Password: return R.id.keyguard_password_view; - case Account: return R.id.keyguard_account_view; case SimPin: return R.id.keyguard_sim_pin_view; case SimPuk: return R.id.keyguard_sim_puk_view; } @@ -534,7 +519,6 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe case Pattern: return R.layout.keyguard_pattern_view; case PIN: return R.layout.keyguard_pin_view; case Password: return R.layout.keyguard_password_view; - case Account: return R.layout.keyguard_account_view; case SimPin: return R.layout.keyguard_sim_pin_view; case SimPuk: return R.layout.keyguard_sim_puk_view; default: |