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

Merge "Update face lockout co-ex message" into sc-v2-dev

Browse Source
This commit is contained in:
Beverly Tai
2021-10-10 23:32:17 +00:00
committed by Android (Google) Code Review
parent c8ce41fa89 7cbb52f06d
commit bb72307118
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -819,12 +819,15 @@ public class KeyguardIndicationController {
} }
} }
private void showTryFingerprintMsg(String a11yString) { private void showTryFingerprintMsg(int msgId, String a11yString) {
if (mKeyguardUpdateMonitor.isUdfpsAvailable()) { if (mKeyguardUpdateMonitor.isUdfpsAvailable()) {
// if udfps available, there will always be a tappable affordance to unlock // if udfps available, there will always be a tappable affordance to unlock
// For example, the lock icon // For example, the lock icon
if (mKeyguardBypassController.getUserHasDeviceEntryIntent()) { if (mKeyguardBypassController.getUserHasDeviceEntryIntent()) {
showTransientIndication(R.string.keyguard_unlock_press); showTransientIndication(R.string.keyguard_unlock_press);
} else if (msgId == FaceManager.FACE_ERROR_LOCKOUT_PERMANENT) {
// since face is locked out, simply show "try fingerprint"
showTransientIndication(R.string.keyguard_try_fingerprint);
} else { } else {
showTransientIndication(R.string.keyguard_face_failed_use_fp); showTransientIndication(R.string.keyguard_face_failed_use_fp);
} }
@@ -916,7 +919,7 @@ public class KeyguardIndicationController {
} else if (mKeyguardUpdateMonitor.isScreenOn()) { } else if (mKeyguardUpdateMonitor.isScreenOn()) {
if (biometricSourceType == BiometricSourceType.FACE if (biometricSourceType == BiometricSourceType.FACE
&& shouldSuppressFaceMsgAndShowTryFingerprintMsg()) { && shouldSuppressFaceMsgAndShowTryFingerprintMsg()) {
showTryFingerprintMsg(helpString); showTryFingerprintMsg(msgId, helpString);
return; return;
} }
showTransientIndication(helpString, false /* isError */, showActionToUnlock); showTransientIndication(helpString, false /* isError */, showActionToUnlock);
@@ -936,7 +939,7 @@ public class KeyguardIndicationController {
&& shouldSuppressFaceMsgAndShowTryFingerprintMsg() && shouldSuppressFaceMsgAndShowTryFingerprintMsg()
&& !mStatusBarKeyguardViewManager.isBouncerShowing() && !mStatusBarKeyguardViewManager.isBouncerShowing()
&& mKeyguardUpdateMonitor.isScreenOn()) { && mKeyguardUpdateMonitor.isScreenOn()) {
showTryFingerprintMsg(errString); showTryFingerprintMsg(msgId, errString);
return; return;
} }
if (msgId == FaceManager.FACE_ERROR_TIMEOUT) { if (msgId == FaceManager.FACE_ERROR_TIMEOUT) {
@@ -945,7 +948,7 @@ public class KeyguardIndicationController {
if (!mStatusBarKeyguardViewManager.isBouncerShowing() if (!mStatusBarKeyguardViewManager.isBouncerShowing()
&& mKeyguardUpdateMonitor.isUdfpsEnrolled() && mKeyguardUpdateMonitor.isUdfpsEnrolled()
&& mKeyguardUpdateMonitor.isFingerprintDetectionRunning()) { && mKeyguardUpdateMonitor.isFingerprintDetectionRunning()) {
showTryFingerprintMsg(errString); showTryFingerprintMsg(msgId, errString);
} else if (mStatusBarKeyguardViewManager.isShowingAlternateAuth()) { } else if (mStatusBarKeyguardViewManager.isShowingAlternateAuth()) {
mStatusBarKeyguardViewManager.showBouncerMessage( mStatusBarKeyguardViewManager.showBouncerMessage(
mContext.getResources().getString(R.string.keyguard_unlock_press), mContext.getResources().getString(R.string.keyguard_unlock_press),
@@ -989,8 +992,8 @@ public class KeyguardIndicationController {
private boolean shouldSuppressFaceMsgAndShowTryFingerprintMsg() { private boolean shouldSuppressFaceMsgAndShowTryFingerprintMsg() {
// For dual biometric, don't show face auth messages // For dual biometric, don't show face auth messages
return mKeyguardUpdateMonitor.isFingerprintDetectionRunning() return mKeyguardUpdateMonitor.isFingerprintDetectionRunning()
&& mKeyguardUpdateMonitor.isUnlockingWithBiometricAllowed( && mKeyguardUpdateMonitor.isUnlockingWithBiometricAllowed(
true /* isStrongBiometric */); true /* isStrongBiometric */);
} }
private boolean shouldSuppressFaceError(int msgId, KeyguardUpdateMonitor updateMonitor) { private boolean shouldSuppressFaceError(int msgId, KeyguardUpdateMonitor updateMonitor) {