Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix keyguard timeout dialog messages" into jb-mr1-dev

Browse Source
This commit is contained in:
Jim Miller
2012-09-16 11:57:23 -07:00
committed by Android (Google) Code Review
parent 7db4eec595 08b2b6bfe2
commit b45965f519
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
View File

@@ -348,6 +348,7 @@ public class KeyguardHostView extends KeyguardViewBase {
(failedAttemptsBeforeWipe - failedAttempts) (failedAttemptsBeforeWipe - failedAttempts)
: Integer.MAX_VALUE; // because DPM returns 0 if no restriction : Integer.MAX_VALUE; // because DPM returns 0 if no restriction
boolean showTimeout = false;
if (remainingBeforeWipe < LockPatternUtils.FAILED_ATTEMPTS_BEFORE_WIPE_GRACE) { if (remainingBeforeWipe < LockPatternUtils.FAILED_ATTEMPTS_BEFORE_WIPE_GRACE) {
// If we reach this code, it means the user has installed a DevicePolicyManager // If we reach this code, it means the user has installed a DevicePolicyManager
// that requests device wipe after N attempts. Once we get below the grace // that requests device wipe after N attempts. Once we get below the grace
@@ -361,7 +362,7 @@ public class KeyguardHostView extends KeyguardViewBase {
showWipeDialog(failedAttempts); showWipeDialog(failedAttempts);
} }
} else { } else {
boolean showTimeout = showTimeout =
(failedAttempts % LockPatternUtils.FAILED_ATTEMPTS_BEFORE_TIMEOUT) == 0; (failedAttempts % LockPatternUtils.FAILED_ATTEMPTS_BEFORE_TIMEOUT) == 0;
if (usingPattern && mEnableFallback) { if (usingPattern && mEnableFallback) {
if (failedAttempts == failedAttemptWarning) { if (failedAttempts == failedAttemptWarning) {
@@ -374,12 +375,12 @@ public class KeyguardHostView extends KeyguardViewBase {
showTimeout = false; showTimeout = false;
} }
} }
if (showTimeout) {
showTimeoutDialog();
}
} }
monitor.reportFailedUnlockAttempt(); monitor.reportFailedUnlockAttempt();
mLockPatternUtils.reportFailedPasswordAttempt(); mLockPatternUtils.reportFailedPasswordAttempt();
if (showTimeout) {
showTimeoutDialog();
}
} }
/** /**

13
policy/src/com/android/internal/policy/impl/keyguard/KeyguardPasswordView.java
View File

@@ -97,11 +97,17 @@ public class KeyguardPasswordView extends LinearLayout
if (deadline != 0) { if (deadline != 0) {
handleAttemptLockout(deadline); handleAttemptLockout(deadline);
} else { } else {
mNavigationManager.setMessage( resetState();
mIsAlpha ? R.string.kg_password_instructions : R.string.kg_pin_instructions);
} }
} }
private void resetState() {
mNavigationManager.setMessage(
mIsAlpha ? R.string.kg_password_instructions : R.string.kg_pin_instructions);
mPasswordEntry.setEnabled(true);
mKeyboardView.setEnabled(true);
}
@Override @Override
protected void onFinishInflate() { protected void onFinishInflate() {
mLockPatternUtils = new LockPatternUtils(mContext); // TODO: use common one mLockPatternUtils = new LockPatternUtils(mContext); // TODO: use common one
@@ -297,8 +303,7 @@ public class KeyguardPasswordView extends LinearLayout
@Override @Override
public void onFinish() { public void onFinish() {
mPasswordEntry.setEnabled(true); resetState();
mKeyboardView.setEnabled(true);
} }
}.start(); }.start();
} }

5
policy/src/com/android/internal/policy/impl/keyguard/KeyguardStatusViewManager.java
View File

@@ -54,7 +54,7 @@ class KeyguardStatusViewManager {
private static final int BATTERY_INFO = 15; private static final int BATTERY_INFO = 15;
private StatusMode mStatus; private StatusMode mStatus;
private String mDateFormatString; private CharSequence mDateFormatString;
// Views that this class controls. // Views that this class controls.
// NOTE: These may be null in some LockScreen screens and should protect from NPE // NOTE: These may be null in some LockScreen screens and should protect from NPE
@@ -101,7 +101,8 @@ class KeyguardStatusViewManager {
public KeyguardStatusViewManager(View view) { public KeyguardStatusViewManager(View view) {
if (DEBUG) Log.v(TAG, "KeyguardStatusViewManager()"); if (DEBUG) Log.v(TAG, "KeyguardStatusViewManager()");
mContainer = view; mContainer = view;
mDateFormatString = getContext().getString(R.string.abbrev_wday_month_day_no_year); mDateFormatString = getContext().getResources()
.getText(R.string.abbrev_wday_month_day_no_year);
mLockPatternUtils = new LockPatternUtils(view.getContext()); mLockPatternUtils = new LockPatternUtils(view.getContext());
mUpdateMonitor = KeyguardUpdateMonitor.getInstance(view.getContext()); mUpdateMonitor = KeyguardUpdateMonitor.getInstance(view.getContext());