Merge "Keep unlock attempt count after configuration change" into lmp-dev
This commit is contained in:
@@ -72,6 +72,8 @@ public class ConfirmLockPassword extends SettingsActivity {
|
|||||||
|
|
||||||
public static class ConfirmLockPasswordFragment extends Fragment implements OnClickListener,
|
public static class ConfirmLockPasswordFragment extends Fragment implements OnClickListener,
|
||||||
OnEditorActionListener, TextWatcher {
|
OnEditorActionListener, TextWatcher {
|
||||||
|
private static final String KEY_NUM_WRONG_CONFIRM_ATTEMPTS
|
||||||
|
= "confirm_lock_password_fragment.key_num_wrong_confirm_attempts";
|
||||||
private static final long ERROR_MESSAGE_TIMEOUT = 3000;
|
private static final long ERROR_MESSAGE_TIMEOUT = 3000;
|
||||||
private TextView mPasswordEntry;
|
private TextView mPasswordEntry;
|
||||||
private LockPatternUtils mLockPatternUtils;
|
private LockPatternUtils mLockPatternUtils;
|
||||||
@@ -93,6 +95,10 @@ public class ConfirmLockPassword extends SettingsActivity {
|
|||||||
public void onCreate(Bundle savedInstanceState) {
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
mLockPatternUtils = new LockPatternUtils(getActivity());
|
mLockPatternUtils = new LockPatternUtils(getActivity());
|
||||||
|
if (savedInstanceState != null) {
|
||||||
|
mNumWrongConfirmAttempts = savedInstanceState.getInt(
|
||||||
|
KEY_NUM_WRONG_CONFIRM_ATTEMPTS, 0);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -166,6 +172,12 @@ public class ConfirmLockPassword extends SettingsActivity {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onSaveInstanceState(Bundle outState) {
|
||||||
|
super.onSaveInstanceState(outState);
|
||||||
|
outState.putInt(KEY_NUM_WRONG_CONFIRM_ATTEMPTS, mNumWrongConfirmAttempts);
|
||||||
|
}
|
||||||
|
|
||||||
private void handleNext() {
|
private void handleNext() {
|
||||||
final String pin = mPasswordEntry.getText().toString();
|
final String pin = mPasswordEntry.getText().toString();
|
||||||
if (mLockPatternUtils.checkPassword(pin)) {
|
if (mLockPatternUtils.checkPassword(pin)) {
|
||||||
|
Reference in New Issue
Block a user