commit 7e4d381a48dc9557ef60cd011eb0e43e2e4ec8ee
author Wang, ArvinX <arvinx.wang@intel.com> Fri Nov 09 16:58:25 2018 -0800
committer android-build-merger <android-build-merger@google.com> Fri Nov 09 16:58:25 2018 -0800
tree 8a4b10d42498156b976085b9bff5cd241c69dbbb
parent 657343b8115d1e9fa45e68f030c97d77381934d0
parent b8740842e0da907c208ae3f1a1281c8985fcbcb9

Merge "Unable to input PIN with hardware keyboard"
am: b8740842e0

Change-Id: Ia295f2f9f12738ef944a775c2149b4e3f3ded9d4

packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java
index cb8c119..f400f60 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java
@@ -68,12 +68,18 @@
     protected void setPasswordEntryEnabled(boolean enabled) {
         mPasswordEntry.setEnabled(enabled);
         mOkButton.setEnabled(enabled);
+        if (enabled && !mPasswordEntry.hasFocus()) {
+            mPasswordEntry.requestFocus();
+        }
     }
 
     @Override
     protected void setPasswordEntryInputEnabled(boolean enabled) {
         mPasswordEntry.setEnabled(enabled);
         mOkButton.setEnabled(enabled);
+        if (enabled && !mPasswordEntry.hasFocus()) {
+            mPasswordEntry.requestFocus();
+        }
     }
 
     @Override