Merge "Show 'press to open' after face auth success" into sc-v2-dev

This commit is contained in:
TreeHugger Robot
2021-12-09 21:47:52 +00:00
committed by Android (Google) Code Review

View File

@@ -886,10 +886,16 @@ public class KeyguardIndicationController {
String message = mContext.getString(R.string.keyguard_retry); String message = mContext.getString(R.string.keyguard_retry);
mStatusBarKeyguardViewManager.showBouncerMessage(message, mInitialTextColorState); mStatusBarKeyguardViewManager.showBouncerMessage(message, mInitialTextColorState);
} }
} else {
if (mKeyguardUpdateMonitor.isUdfpsSupported()
&& mKeyguardUpdateMonitor.getUserCanSkipBouncer(
KeyguardUpdateMonitor.getCurrentUser())) {
showBiometricMessage(mContext.getString(R.string.keyguard_unlock_press));
} else { } else {
showBiometricMessage(mContext.getString(R.string.keyguard_unlock)); showBiometricMessage(mContext.getString(R.string.keyguard_unlock));
} }
} }
}
private void showTryFingerprintMsg(int msgId, String a11yString) { private void showTryFingerprintMsg(int msgId, String a11yString) {
if (mKeyguardUpdateMonitor.isUdfpsSupported()) { if (mKeyguardUpdateMonitor.isUdfpsSupported()) {