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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14747648

Change-Id: Idfd21a99a4c087c7aac6f4944361da9adead90e2
This commit is contained in:
TreeHugger Robot
2021-05-28 02:46:47 +00:00
committed by Automerger Merge Worker

View File

@@ -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();
}
}