Merge "Fix Password entry won't enable when lockout finished in screen-off" into qt-qpr1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
407f2f37c8
@@ -86,13 +86,12 @@ public class KeyguardPasswordView extends KeyguardAbsKeyInputView
|
||||
mSecurityMessageDisplay.setMessage("");
|
||||
}
|
||||
final boolean wasDisabled = mPasswordEntry.isEnabled();
|
||||
// Don't set enabled password entry & showSoftInput when PasswordEntry is invisible or in
|
||||
// pausing stage.
|
||||
setPasswordEntryEnabled(true);
|
||||
setPasswordEntryInputEnabled(true);
|
||||
// Don't call showSoftInput when PasswordEntry is invisible or in pausing stage.
|
||||
if (!mResumed || !mPasswordEntry.isVisibleToUser()) {
|
||||
return;
|
||||
}
|
||||
setPasswordEntryEnabled(true);
|
||||
setPasswordEntryInputEnabled(true);
|
||||
if (wasDisabled) {
|
||||
mImm.showSoftInput(mPasswordEntry, InputMethodManager.SHOW_IMPLICIT);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user