diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 898f66d9939bd..33ed7b8421db6 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -338,7 +338,7 @@
Tap Confirm to complete
- Unlocked by face. Press to continue.
+ Unlocked by face. Press the unlock icon to continue.
Authenticated
@@ -796,8 +796,11 @@
Swipe up to open
-
- Press to open
+
+ Press the unlock icon to open
+
+
+ Unlocked by face. Press the unlock icon to open.
Swipe up to try again
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
index 7dd11b1e5db8c..dd2664dacf499 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
@@ -1173,7 +1173,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
|| isSimPinSecure());
}
- private boolean getIsFaceAuthenticated() {
+ /**
+ * @return whether the current user has been authenticated with face. This may be true
+ * on the lockscreen if the user doesn't have bypass enabled.
+ */
+ public boolean getIsFaceAuthenticated() {
boolean faceAuthenticated = false;
BiometricAuthenticated bioFaceAuthenticated = mUserFaceAuthenticated.get(getCurrentUser());
if (bioFaceAuthenticated != null) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
index 55ca8f3fd6346..b07a898e356b4 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
@@ -887,7 +887,10 @@ public class KeyguardIndicationController {
if (mKeyguardUpdateMonitor.isUdfpsSupported()
&& mKeyguardUpdateMonitor.getUserCanSkipBouncer(
KeyguardUpdateMonitor.getCurrentUser())) {
- showBiometricMessage(mContext.getString(R.string.keyguard_unlock_press));
+ final int stringId = mKeyguardUpdateMonitor.getIsFaceAuthenticated()
+ ? R.string.keyguard_face_successful_unlock_press
+ : R.string.keyguard_unlock_press;
+ showBiometricMessage(mContext.getString(stringId));
} else {
showBiometricMessage(mContext.getString(R.string.keyguard_unlock));
}