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

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

Change-Id: I6eac42a07afa033608dcfb1e07f49ecd68fa1026
This commit is contained in:
Charles Chen
2021-06-05 02:01:56 +00:00
committed by Automerger Merge Worker

View File

@@ -62,10 +62,9 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView
@Override
protected void setPasswordEntryEnabled(boolean enabled) {
boolean wasEnabled = mPasswordEntry.isEnabled();
mPasswordEntry.setEnabled(enabled);
mOkButton.setEnabled(enabled);
if (enabled && !wasEnabled && !mPasswordEntry.hasFocus()) {
if (enabled && !mPasswordEntry.hasFocus()) {
mPasswordEntry.requestFocus();
}
}