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

Commit 0896997a authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Suggest use fp after face-auth fail" into sc-dev am: 08d64fbc 

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

Change-Id: I8c096932d5d703b13ffedc1a6d1cd35804d7d06a
parents 92a5c830 08d64fbc

packages/SystemUI/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -2971,4 +2971,7 @@ 
    <!-- Accessibility action for tapping on an affordance on an unlocked lock screen (ie: "Double

     tap to enter device") [CHAR LIMIT=NONE] -->

    <string name="accessibility_enter_hint">enter device</string>

    <!-- Message shown to suggest authentication using [CHAR LIMIT=60]-->

    <string name="keyguard_try_fingerprint">Use fingerprint to open</string>



</resources>

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

+8 −1
Original line number Diff line number Diff line
@@ -888,7 +888,14 @@ public class KeyguardIndicationController implements KeyguardStateController.Cal 
            if (msgId == FaceManager.FACE_ERROR_TIMEOUT) {

                // The face timeout message is not very actionable, let's ask the user to

                // manually retry.

                if (!mStatusBarKeyguardViewManager.isBouncerShowing()

                        && mKeyguardUpdateMonitor.isUdfpsEnrolled()) {

                    // suggest trying fingerprint

                    showTransientIndication(R.string.keyguard_try_fingerprint);

                } else {

                    // suggest swiping up to unlock (try face auth again or swipe up to bouncer)

                    showSwipeUpToUnlock();

                }

            } else if (mStatusBarKeyguardViewManager.isBouncerShowing()) {

                mStatusBarKeyguardViewManager.showBouncerMessage(errString, mInitialTextColorState);

            } else if (mKeyguardUpdateMonitor.isScreenOn()) {