Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix Password entry won't enable when lockout finished in screen-off" into qt-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-09-26 00:42:31 +00:00
committed by Android (Google) Code Review
parent 9c743a222d e98f04b936
commit 407f2f37c8
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/keyguard/KeyguardPasswordView.java
View File

@@ -86,13 +86,12 @@ public class KeyguardPasswordView extends KeyguardAbsKeyInputView
mSecurityMessageDisplay.setMessage(""); mSecurityMessageDisplay.setMessage("");
} }
final boolean wasDisabled = mPasswordEntry.isEnabled(); final boolean wasDisabled = mPasswordEntry.isEnabled();
// Don't set enabled password entry & showSoftInput when PasswordEntry is invisible or in setPasswordEntryEnabled(true);
// pausing stage. setPasswordEntryInputEnabled(true);
// Don't call showSoftInput when PasswordEntry is invisible or in pausing stage.
if (!mResumed || !mPasswordEntry.isVisibleToUser()) { if (!mResumed || !mPasswordEntry.isVisibleToUser()) {
return; return;
} }
setPasswordEntryEnabled(true);
setPasswordEntryInputEnabled(true);
if (wasDisabled) { if (wasDisabled) {
mImm.showSoftInput(mPasswordEntry, InputMethodManager.SHOW_IMPLICIT); mImm.showSoftInput(mPasswordEntry, InputMethodManager.SHOW_IMPLICIT);
} }