Merge "Don't request PIN field focus again unless re-enabled" into sc-dev

2021-05-27 19:50:04 +00:00
parent 9dfba75b3b 3ce118c58c
commit e85e15137c
1 changed files with 2 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java
@@ -62,9 +62,10 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView

    @Override
    protected void setPasswordEntryEnabled(boolean enabled) {
+        boolean wasEnabled = mPasswordEntry.isEnabled();
        mPasswordEntry.setEnabled(enabled);
        mOkButton.setEnabled(enabled);
-        if (enabled && !mPasswordEntry.hasFocus()) {
+        if (enabled && !wasEnabled && !mPasswordEntry.hasFocus()) {
            mPasswordEntry.requestFocus();
        }
    }