PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "No auto soft keyboard when fp is in use" into mnc-dev

Browse Source
This commit is contained in:
Xiyuan Xia
2015-05-26 21:05:24 +00:00
committed by Android (Google) Code Review
parent 44fb627cf6 4f8102d4f2
commit a4e0492c11
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/ConfirmLockPassword.java
View File

@@ -88,6 +88,7 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
private CountDownTimer mCountdownTimer;
private boolean mIsAlpha;
private InputMethodManager mImm;
private boolean mUsingFingerprint = false;
// required constructor for fragments
public ConfirmLockPasswordFragment() {
@@ -203,10 +204,21 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
getActivity().finish();
}
@Override
public void onFingerprintIconVisibilityChanged(boolean visible) {
mUsingFingerprint = visible;
}
private void resetState() {
mPasswordEntry.setEnabled(true);
mPasswordEntryInputDisabler.setInputEnabled(true);
mImm.showSoftInput(mPasswordEntry, InputMethodManager.SHOW_IMPLICIT);
if (shouldAutoShowSoftKeyboard()) {
mImm.showSoftInput(mPasswordEntry, InputMethodManager.SHOW_IMPLICIT);
}
}
private boolean shouldAutoShowSoftKeyboard() {
return mPasswordEntry.isEnabled() && !mUsingFingerprint;
}
public void onWindowFocusChanged(boolean hasFocus) {
@@ -217,7 +229,7 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
mPasswordEntry.post(new Runnable() {
@Override
public void run() {
if (mPasswordEntry.isEnabled()) {
if (shouldAutoShowSoftKeyboard()) {
resetState();
return;
}