Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9782e2c1 authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Update UDFPS "press to unlock" strings" into tm-dev am: 099fac63 am: 19f9e9c8 

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



Change-Id: Iecb201c8980b2717722857268d35e9c310f156fe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 295748a6 19f9e9c8

packages/SystemUI/res/values/strings.xml

+6 −3
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ 
    <!-- 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>

    <!-- 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] -->

    <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] -->

    <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] -->

    <string name="keyguard_unlock_press">Press to open</string>

    <!-- 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 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] -->

    <string name="keyguard_retry">Swipe up to try again</string>

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+5 −1
Original line number Diff line number Diff line
@@ -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) {

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

+4 −1
Original line number Diff line number Diff line
@@ -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));

            }