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

Commit 18b39ab0 authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Co-ex: when face fails use error string" into sc-dev am: 62fdd7cf 

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

Change-Id: I2d279fcb4e305a6f02e2eb46541659faa06168e4
parents b5250284 62fdd7cf

packages/SystemUI/res/values/strings.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -438,6 +438,8 @@ 
    <string name="fingerprint_dialog_use_fingerprint">Use your fingerprint to continue</string>

    <string name="fingerprint_dialog_use_fingerprint">Use your fingerprint to continue</string>

    <!-- Message shown to ask the user to use screenlock to continue.[CHAR LIMIT=NONE] -->

    <!-- Message shown to ask the user to use screenlock to continue.[CHAR LIMIT=NONE] -->

    <string name="fingerprint_dialog_cant_recognize_fp_use_screenlock">Can\u2019t recognize fingerprint. Use screen lock instead.</string>

    <string name="fingerprint_dialog_cant_recognize_fp_use_screenlock">Can\u2019t recognize fingerprint. Use screen lock instead.</string>

    <!-- Message shown to inform the user a face cannot be recognized and fingerprint should instead be used.[CHAR LIMIT=50] -->

    <string name="keyguard_face_failed_use_fp">@string/fingerprint_dialog_use_fingerprint_instead</string>





    <!-- Message shown when the system-provided face dialog is shown, asking for authentication [CHAR LIMIT=30] -->

    <!-- Message shown when the system-provided face dialog is shown, asking for authentication [CHAR LIMIT=30] -->

    <string name="face_dialog_looking_for_face">Looking for you\u2026</string>

    <string name="face_dialog_looking_for_face">Looking for you\u2026</string>

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

+5 −1
Original line number Original line Diff line number Diff line
@@ -825,7 +825,11 @@ public class KeyguardIndicationController { 
        if (mKeyguardUpdateMonitor.isUdfpsAvailable()) {

        if (mKeyguardUpdateMonitor.isUdfpsAvailable()) {

            // if udfps available, there will always be a tappable affordance to unlock

            // if udfps available, there will always be a tappable affordance to unlock

            // For example, the lock icon

            // For example, the lock icon

            if (mKeyguardBypassController.getUserHasDeviceEntryIntent()) {

                showTransientIndication(R.string.keyguard_unlock_press);

                showTransientIndication(R.string.keyguard_unlock_press);

            } else {

                showTransientIndication(R.string.keyguard_face_failed_use_fp);

            }

        } else {

        } else {

            showTransientIndication(R.string.keyguard_try_fingerprint);

            showTransientIndication(R.string.keyguard_try_fingerprint);

        }

        }