Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d6cec8c authored by Charles He's avatar Charles He Committed by Android (Google) Code Review
Browse files

Merge "Clear "Wrong pattern" prompt automatically." into oc-mr1-dev

parents 6c9a1262 caf95109

src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java

+3 −0
Original line number Diff line number Diff line
@@ -77,6 +77,9 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra 
    protected static final int USER_TYPE_MANAGED_PROFILE = 2;

    protected static final int USER_TYPE_SECONDARY = 3;



    /** Time we wait before clearing a wrong input attempt (e.g. pattern) and the error message. */

    protected static final long CLEAR_WRONG_ATTEMPT_TIMEOUT_MS = 3000;



    private FingerprintUiHelper mFingerprintHelper;

    protected boolean mReturnCredentials = false;

    protected Button mCancelButton;

src/com/android/settings/password/ConfirmLockPassword.java

+1 −2
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity { 
    public static class ConfirmLockPasswordFragment extends ConfirmDeviceCredentialBaseFragment

            implements OnClickListener, OnEditorActionListener,

            CredentialCheckResultTracker.Listener {

        private static final long ERROR_MESSAGE_TIMEOUT = 3000;

        private static final String FRAGMENT_TAG_CHECK_LOCK_RESULT = "check_lock_result";

        private ImeAwareEditText mPasswordEntry;

        private TextViewInputDisabler mPasswordEntryInputDisabler;
@@ -460,7 +459,7 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity { 
                            effectiveUserId, timeoutMs);

                    handleAttemptLockout(deadline);

                } else {

                    showError(getErrorMessage(), ERROR_MESSAGE_TIMEOUT);

                    showError(getErrorMessage(), CLEAR_WRONG_ATTEMPT_TIMEOUT_MS);

                }

                if (newResult) {

                    reportFailedAttempt();

src/com/android/settings/password/ConfirmLockPattern.java

+3 −5
Original line number Diff line number Diff line
@@ -79,9 +79,6 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity { 
    public static class ConfirmLockPatternFragment extends ConfirmDeviceCredentialBaseFragment

            implements AppearAnimationCreator<Object>, CredentialCheckResultTracker.Listener {



        // how long we wait to clear a wrong pattern

        private static final int WRONG_PATTERN_CLEAR_TIMEOUT_MS = 2000;



        private static final String FRAGMENT_TAG_CHECK_LOCK_RESULT = "check_lock_result";



        private LockPatternView mLockPatternView;
@@ -315,7 +312,8 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity { 
                    mLockPatternView.clearPattern();

                    break;

                case NeedToUnlockWrong:

                    mErrorTextView.setText(R.string.lockpattern_need_to_unlock_wrong);

                    showError(R.string.lockpattern_need_to_unlock_wrong,

                            CLEAR_WRONG_ATTEMPT_TIMEOUT_MS);



                    mLockPatternView.setDisplayMode(LockPatternView.DisplayMode.Wrong);

                    mLockPatternView.setEnabled(true);
@@ -349,7 +347,7 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity { 
        // already

        private void postClearPatternRunnable() {

            mLockPatternView.removeCallbacks(mClearPatternRunnable);

            mLockPatternView.postDelayed(mClearPatternRunnable, WRONG_PATTERN_CLEAR_TIMEOUT_MS);

            mLockPatternView.postDelayed(mClearPatternRunnable, CLEAR_WRONG_ATTEMPT_TIMEOUT_MS);

        }



        @Override