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

Merge "Always show face auth error messages on bouncer" into sc-dev

Browse Source
This commit is contained in:
Beverly Tai
2021-07-07 13:21:49 +00:00
committed by Android (Google) Code Review
parent 4122f67075 b7aa5bfe3e
commit 34d05933cc
1 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
View File

@@ -597,8 +597,8 @@ public class KeyguardIndicationController implements KeyguardStateController.Cal
if (mDozing && !TextUtils.isEmpty(mTransientIndication)) { if (mDozing && !TextUtils.isEmpty(mTransientIndication)) {
// Make sure this doesn't get stuck and burns in. Acquire wakelock until its cleared. // Make sure this doesn't get stuck and burns in. Acquire wakelock until its cleared.
mWakeLock.setAcquired(true); mWakeLock.setAcquired(true);
hideTransientIndicationDelayed(BaseKeyguardCallback.HIDE_DELAY_MS);
} }
hideTransientIndicationDelayed(BaseKeyguardCallback.HIDE_DELAY_MS);
updateIndication(false); updateIndication(false);
} }
@@ -802,7 +802,6 @@ public class KeyguardIndicationController implements KeyguardStateController.Cal
} else if (mKeyguardUpdateMonitor.isScreenOn()) { } else if (mKeyguardUpdateMonitor.isScreenOn()) {
showTransientIndication(mContext.getString(R.string.keyguard_unlock), showTransientIndication(mContext.getString(R.string.keyguard_unlock),
false /* isError */, true /* hideOnScreenOff */); false /* isError */, true /* hideOnScreenOff */);
hideTransientIndicationDelayed(BaseKeyguardCallback.HIDE_DELAY_MS);
} }
} }
@@ -862,7 +861,6 @@ public class KeyguardIndicationController implements KeyguardStateController.Cal
if (mDozing) { if (mDozing) {
if (!wasPluggedIn && mPowerPluggedIn) { if (!wasPluggedIn && mPowerPluggedIn) {
showTransientIndication(computePowerIndication()); showTransientIndication(computePowerIndication());
hideTransientIndicationDelayed(HIDE_DELAY_MS);
} else if (wasPluggedIn && !mPowerPluggedIn) { } else if (wasPluggedIn && !mPowerPluggedIn) {
hideTransientIndication(); hideTransientIndication();
} }
@@ -882,23 +880,19 @@ public class KeyguardIndicationController implements KeyguardStateController.Cal
return; return;
} }
if (biometricSourceType == BiometricSourceType.FACE
&& shouldSuppressFaceMsgAndShowTryFingerprintMsg()) {
// suggest trying fingerprint
showTransientIndication(R.string.keyguard_try_fingerprint);
return;
}
boolean showSwipeToUnlock = boolean showSwipeToUnlock =
msgId == KeyguardUpdateMonitor.BIOMETRIC_HELP_FACE_NOT_RECOGNIZED; msgId == KeyguardUpdateMonitor.BIOMETRIC_HELP_FACE_NOT_RECOGNIZED;
if (mStatusBarKeyguardViewManager.isBouncerShowing()) { if (mStatusBarKeyguardViewManager.isBouncerShowing()) {
mStatusBarKeyguardViewManager.showBouncerMessage(helpString, mStatusBarKeyguardViewManager.showBouncerMessage(helpString,
mInitialTextColorState); mInitialTextColorState);
} else if (mKeyguardUpdateMonitor.isScreenOn()) { } else if (mKeyguardUpdateMonitor.isScreenOn()) {
showTransientIndication(helpString, false /* isError */, showSwipeToUnlock); if (biometricSourceType == BiometricSourceType.FACE
if (!showSwipeToUnlock) { && shouldSuppressFaceMsgAndShowTryFingerprintMsg()) {
hideTransientIndicationDelayed(TRANSIENT_BIOMETRIC_ERROR_TIMEOUT); // suggest trying fingerprint
showTransientIndication(R.string.keyguard_try_fingerprint);
return;
} }
showTransientIndication(helpString, false /* isError */, showSwipeToUnlock);
} }
if (showSwipeToUnlock) { if (showSwipeToUnlock) {
mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_SWIPE_UP_TO_UNLOCK), mHandler.sendMessageDelayed(mHandler.obtainMessage(MSG_SWIPE_UP_TO_UNLOCK),
@@ -913,7 +907,9 @@ public class KeyguardIndicationController implements KeyguardStateController.Cal
return; return;
} }
if (biometricSourceType == BiometricSourceType.FACE if (biometricSourceType == BiometricSourceType.FACE
&& shouldSuppressFaceMsgAndShowTryFingerprintMsg()) { && shouldSuppressFaceMsgAndShowTryFingerprintMsg()
&& !mStatusBarKeyguardViewManager.isBouncerShowing()
&& mKeyguardUpdateMonitor.isScreenOn()) {
// suggest trying fingerprint // suggest trying fingerprint
showTransientIndication(R.string.keyguard_try_fingerprint); showTransientIndication(R.string.keyguard_try_fingerprint);
return; return;
@@ -935,8 +931,6 @@ public class KeyguardIndicationController implements KeyguardStateController.Cal
} else if (mKeyguardUpdateMonitor.isScreenOn()) { } else if (mKeyguardUpdateMonitor.isScreenOn()) {
showTransientIndication(errString, /* isError */ true, showTransientIndication(errString, /* isError */ true,
/* hideOnScreenOff */ true); /* hideOnScreenOff */ true);
// We want to keep this message around in case the screen was off
hideTransientIndicationDelayed(HIDE_DELAY_MS);
} else { } else {
mMessageToShowOnScreenOn = errString; mMessageToShowOnScreenOn = errString;
} }