drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update UDFPS "press to unlock" strings" into tm-dev

Browse Source
This commit is contained in:
Beverly Tai 2022-04-02 14:36:15 +00:00 committed by Android (Google) Code Review
commit 099fac63e3
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/res/values/strings.xml
View File

@ -338,7 +338,7 @@
<!-- Message shown when a biometric is authenticated, waiting for the user to confirm authentication [CHAR LIMIT=40]--> <!-- Message shown when a biometric is authenticated, waiting for the user to confirm authentication [CHAR LIMIT=40]-->
<string name="biometric_dialog_tap_confirm">Tap Confirm to complete</string> <string name="biometric_dialog_tap_confirm">Tap Confirm to complete</string>
<!-- Message shown when a biometric has authenticated with a user's face and is waiting for the user to confirm authentication [CHAR LIMIT=60]--> <!-- Message shown when a biometric has authenticated with a user's face and is waiting for the user to confirm authentication [CHAR LIMIT=60]-->
<string name="biometric_dialog_tap_confirm_with_face">Unlocked by face. Press to continue.</string> <string name="biometric_dialog_tap_confirm_with_face">Unlocked by face. Press the unlock icon to continue.</string>
<!-- Talkback string when a biometric is authenticated [CHAR LIMIT=NONE] --> <!-- Talkback string when a biometric is authenticated [CHAR LIMIT=NONE] -->
<string name="biometric_dialog_authenticated">Authenticated</string> <string name="biometric_dialog_authenticated">Authenticated</string>
@ -796,8 +796,11 @@
<!-- Message shown when lock screen is tapped or face authentication fails. [CHAR LIMIT=60] --> <!-- Message shown when lock screen is tapped or face authentication fails. [CHAR LIMIT=60] -->
<string name="keyguard_unlock">Swipe up to open</string> <string name="keyguard_unlock">Swipe up to open</string>
<!-- Message shown when lock screen is tapped or face authentication fails. Provides extra instructions for how the user can enter their device (unlock or proceed to home) [CHAR LIMIT=60] --> <!-- Message shown when lock screen is unlocked (ie: by trust agent) and the user taps the empty space on the lock screen and UDFPS is supported. Provides extra instructions for how the user can enter their device [CHAR LIMIT=60] -->
<string name="keyguard_unlock_press">Press to open</string> <string name="keyguard_unlock_press">Press the unlock icon to open</string>
<!-- Message shown when non-bypass face authentication succeeds and UDFPS is supported. Provides extra instructions for how the user can enter their device [CHAR LIMIT=60] -->
<string name="keyguard_face_successful_unlock_press">Unlocked by face. Press the unlock icon to open.</string>
<!-- Message shown when face authentication fails and the pin pad is visible. [CHAR LIMIT=60] --> <!-- Message shown when face authentication fails and the pin pad is visible. [CHAR LIMIT=60] -->
<string name="keyguard_retry">Swipe up to try again</string> <string name="keyguard_retry">Swipe up to try again</string>

6
packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
View File

@ -1173,7 +1173,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
|| isSimPinSecure()); || 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; boolean faceAuthenticated = false;
BiometricAuthenticated bioFaceAuthenticated = mUserFaceAuthenticated.get(getCurrentUser()); BiometricAuthenticated bioFaceAuthenticated = mUserFaceAuthenticated.get(getCurrentUser());
if (bioFaceAuthenticated != null) { if (bioFaceAuthenticated != null) {

5
packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
View File

@ -887,7 +887,10 @@ public class KeyguardIndicationController {
if (mKeyguardUpdateMonitor.isUdfpsSupported() if (mKeyguardUpdateMonitor.isUdfpsSupported()
&& mKeyguardUpdateMonitor.getUserCanSkipBouncer( && mKeyguardUpdateMonitor.getUserCanSkipBouncer(
KeyguardUpdateMonitor.getCurrentUser())) { 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 { } else {
showBiometricMessage(mContext.getString(R.string.keyguard_unlock)); showBiometricMessage(mContext.getString(R.string.keyguard_unlock));
} }