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

Commit ec071652 authored by Beverly Tai's avatar Beverly Tai Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-03c717081b8041d984fabd05965efce5" into tm-mainline-prod 

* changes:
  [automerge] Ask user to try fingerprint after face auth fail 2p: e1aa212d
  Ask user to try fingerprint after face auth fail
parents b193890c 073639ab

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

+6 −19
Original line number Diff line number Diff line
@@ -896,21 +896,8 @@ public class KeyguardIndicationController { 
        }

    }



    private void showTryFingerprintMsg(int msgId, String a11yString) {

        if (mKeyguardUpdateMonitor.isUdfpsSupported()) {

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

            // For example, the lock icon

            if (mKeyguardBypassController.getUserHasDeviceEntryIntent()) {

                showBiometricMessage(R.string.keyguard_unlock_press);

            } else if (msgId == FaceManager.FACE_ERROR_LOCKOUT_PERMANENT) {

                // since face is locked out, simply show "try fingerprint"

                showBiometricMessage(R.string.keyguard_try_fingerprint);

            } else {

    private void showFaceFailedTryFingerprintMsg(int msgId, String a11yString) {

        showBiometricMessage(R.string.keyguard_face_failed_use_fp);

            }

        } else {

            showBiometricMessage(R.string.keyguard_try_fingerprint);

        }



        // Although we suppress face auth errors visually, we still announce them for a11y

        if (!TextUtils.isEmpty(a11yString)) {
@@ -1002,7 +989,7 @@ public class KeyguardIndicationController { 
            } else if (mScreenLifecycle.getScreenState() == SCREEN_ON) {

                if (biometricSourceType == BiometricSourceType.FACE

                        && shouldSuppressFaceMsgAndShowTryFingerprintMsg()) {

                    showTryFingerprintMsg(msgId, helpString);

                    showFaceFailedTryFingerprintMsg(msgId, helpString);

                    return;

                }

                showBiometricMessage(helpString);
@@ -1022,7 +1009,7 @@ public class KeyguardIndicationController { 
                    && shouldSuppressFaceMsgAndShowTryFingerprintMsg()

                    && !mStatusBarKeyguardViewManager.isBouncerShowing()

                    && mScreenLifecycle.getScreenState() == SCREEN_ON) {

                showTryFingerprintMsg(msgId, errString);

                showFaceFailedTryFingerprintMsg(msgId, errString);

                return;

            }

            if (msgId == FaceManager.FACE_ERROR_TIMEOUT) {
@@ -1031,10 +1018,10 @@ public class KeyguardIndicationController { 
                if (!mStatusBarKeyguardViewManager.isBouncerShowing()

                        && mKeyguardUpdateMonitor.isUdfpsEnrolled()

                        && mKeyguardUpdateMonitor.isFingerprintDetectionRunning()) {

                    showTryFingerprintMsg(msgId, errString);

                    showFaceFailedTryFingerprintMsg(msgId, errString);

                } else if (mStatusBarKeyguardViewManager.isShowingAlternateAuth()) {

                    mStatusBarKeyguardViewManager.showBouncerMessage(

                            mContext.getResources().getString(R.string.keyguard_unlock_press),

                            mContext.getResources().getString(R.string.keyguard_try_fingerprint),

                            mInitialTextColorState

                    );

                } else {