From 1d1b6c8c4fc6b0d2ef1eaf762ea2b8c1124e1d7e Mon Sep 17 00:00:00 2001 From: Aaron Liu Date: Mon, 30 Oct 2023 11:24:10 -0700 Subject: Request focus when we set enabled true When we are verifying the pin code, we invoke setPasswordEntryInputEnabled(false). This sets isEnabled to false on the password textview. Consequently, this is invoking clearFocus; however when we set isEnabled back to true, we are not requesting focus. Ensure that we request focus when textview is enabled again. Fixes: 300250922 Test: with a physical keyboard, enter wrong password and retry. This works before bug fix. Test: with a physical keyboard, enter wrong pin and retry. It works with the bug fix. Flag: NONE Change-Id: I32098c186339080873926196206d65fbe1a22952 --- .../SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java index 681aa70402bd..aaf726685bb8 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java @@ -85,6 +85,9 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView protected void setPasswordEntryInputEnabled(boolean enabled) { mPasswordEntry.setEnabled(enabled); mOkButton.setEnabled(enabled); + if (enabled) { + mPasswordEntry.requestFocus(); + } } @Override -- cgit v1.2.3-59-g8ed1b