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

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

Change-Id: I9ec00554213338a1d479cc9b53e7285b0784cb5a
This commit is contained in:
TreeHugger Robot
2021-12-09 22:20:45 +00:00
committed by Automerger Merge Worker

View File

@@ -887,7 +887,13 @@ public class KeyguardIndicationController {
mStatusBarKeyguardViewManager.showBouncerMessage(message, mInitialTextColorState);
}
} 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));
}
}
}