Merge "Update face lockout co-ex message" into sc-v2-dev (bb723071) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

+9 −6

Original line number	Diff line number	Diff line
		@@ -819,12 +819,15 @@ public class KeyguardIndicationController {
		}
		}

		private void showTryFingerprintMsg(String a11yString) {
		private void showTryFingerprintMsg(int msgId, String a11yString) {
		if (mKeyguardUpdateMonitor.isUdfpsAvailable()) {
		// if udfps available, there will always be a tappable affordance to unlock
		// For example, the lock icon
		if (mKeyguardBypassController.getUserHasDeviceEntryIntent()) {
		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 {
		showTransientIndication(R.string.keyguard_face_failed_use_fp);
		}
		@@ -916,7 +919,7 @@ public class KeyguardIndicationController {
		} else if (mKeyguardUpdateMonitor.isScreenOn()) {
		if (biometricSourceType == BiometricSourceType.FACE
		&& shouldSuppressFaceMsgAndShowTryFingerprintMsg()) {
		showTryFingerprintMsg(helpString);
		showTryFingerprintMsg(msgId, helpString);
		return;
		}
		showTransientIndication(helpString, false /* isError */, showActionToUnlock);
		@@ -936,7 +939,7 @@ public class KeyguardIndicationController {
		&& shouldSuppressFaceMsgAndShowTryFingerprintMsg()
		&& !mStatusBarKeyguardViewManager.isBouncerShowing()
		&& mKeyguardUpdateMonitor.isScreenOn()) {
		showTryFingerprintMsg(errString);
		showTryFingerprintMsg(msgId, errString);
		return;
		}
		if (msgId == FaceManager.FACE_ERROR_TIMEOUT) {
		@@ -945,7 +948,7 @@ public class KeyguardIndicationController {
		if (!mStatusBarKeyguardViewManager.isBouncerShowing()
		&& mKeyguardUpdateMonitor.isUdfpsEnrolled()
		&& mKeyguardUpdateMonitor.isFingerprintDetectionRunning()) {
		showTryFingerprintMsg(errString);
		showTryFingerprintMsg(msgId, errString);
		} else if (mStatusBarKeyguardViewManager.isShowingAlternateAuth()) {
		mStatusBarKeyguardViewManager.showBouncerMessage(
		mContext.getResources().getString(R.string.keyguard_unlock_press),