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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16431949

Change-Id: I1a8ca9a42cde618285ac715efd2c017800a4dd56
This commit is contained in:
TreeHugger Robot
2021-12-09 22:04:35 +00:00
committed by Automerger Merge Worker

View File

@@ -887,7 +887,13 @@ public class KeyguardIndicationController {
mStatusBarKeyguardViewManager.showBouncerMessage(message, mInitialTextColorState); mStatusBarKeyguardViewManager.showBouncerMessage(message, mInitialTextColorState);
} }
} else { } else {
showBiometricMessage(mContext.getString(R.string.keyguard_unlock)); if (mKeyguardUpdateMonitor.isUdfpsSupported()
&& mKeyguardUpdateMonitor.getUserCanSkipBouncer(
KeyguardUpdateMonitor.getCurrentUser())) {
showBiometricMessage(mContext.getString(R.string.keyguard_unlock_press));
} else {
showBiometricMessage(mContext.getString(R.string.keyguard_unlock));
}
} }
} }