diff options
| author | Diego Wilson <diegowilson@google.com> | 2018-11-20 11:38:33 -0800 |
|---|---|---|
| committer | Bill Peckham <bpeckham@google.com> | 2018-12-05 17:57:49 -0800 |
| commit | b76115be4efabffaa6febc57cec47acc2f933c79 (patch) | |
| tree | 3c75adb1327eb78655b3bd8e1fd47db1a650b233 /packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java | |
| parent | b1a0dd53db11fb24b5937212720aa92fa70b4fdd (diff) | |
| parent | 5a05000482abc03a74556ae0e289172eb0ae5607 (diff) | |
Merge QP1A.181119.002
Change-Id: Ieb6ae3730e8b01f867f9b5120de1ab3067653d21
Diffstat (limited to 'packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java')
| -rw-r--r-- | packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java index cb8c119d08eb..3cc18ddf3b2a 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java @@ -23,8 +23,6 @@ import android.view.KeyEvent; import android.view.MotionEvent; import android.view.View; -import com.android.internal.annotations.VisibleForTesting; - /** * A Pin based Keyguard input view */ @@ -68,12 +66,18 @@ public abstract class KeyguardPinBasedInputView extends KeyguardAbsKeyInputView 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 |