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

Commit 3c74e863 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't show 'try fingerprint' msg on face auth help" into sc-v2-dev am:... 

Merge "Don't show 'try fingerprint' msg on face auth help" into sc-v2-dev am: e089bd6d am: a03fa82e

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

Change-Id: Id62a2c93b5b272603d448caa4f47fc6ea8c0c46e
parents 8a17328a a03fa82e

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

+5 −1
Original line number Diff line number Diff line
@@ -912,7 +912,11 @@ public class KeyguardIndicationController { 
            } else if (mKeyguardUpdateMonitor.isScreenOn()) {

                if (biometricSourceType == BiometricSourceType.FACE

                        && shouldSuppressFaceMsgAndShowTryFingerprintMsg()) {

                    showTryFingerprintMsg(msgId, helpString);

                    // don't show any help messages, b/c they can come in right before a success

                    // However, continue to announce help messages for a11y

                    if (!TextUtils.isEmpty(helpString)) {

                        mLockScreenIndicationView.announceForAccessibility(helpString);

                    }

                    return;

                }

                showTransientIndication(helpString, false /* isError */, showActionToUnlock);

packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -710,8 +710,8 @@ public class KeyguardIndicationControllerTest extends SysuiTestCase { 
                KeyguardUpdateMonitor.BIOMETRIC_HELP_FACE_NOT_RECOGNIZED, faceHelpMsg,

                BiometricSourceType.FACE);



        // THEN "try fingerprint" message appears (and not the face help message)

        verifyTransientMessage(mKeyguardTryFingerprintMsg);

        // THEN no help message appears

        verify(mRotateTextViewController, never()).showTransient(anyString());



        // THEN the face help message is still announced for a11y

        verify(mIndicationAreaBottom).announceForAccessibility(eq(faceHelpMsg));