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

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

Merge "Show "use fingerprint to open" msg for coex" into sc-dev am: c2e4423c am: 2b52c55a 

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

Change-Id: If960146f6f3ad72cfcf18a05c0c7960f20a55651
parents 502c2a4a 2b52c55a

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

+8 −3
Original line number Diff line number Diff line
@@ -885,7 +885,10 @@ public class KeyguardIndicationController { 
                mStatusBarKeyguardViewManager.showBouncerMessage(helpString,

                        mInitialTextColorState);

            } else if (mKeyguardUpdateMonitor.isScreenOn()) {

                if (biometricSourceType == BiometricSourceType.FACE && shouldSuppressFaceMsg()) {

                if (biometricSourceType == BiometricSourceType.FACE

                        && shouldSuppressFaceMsgAndShowTryFingerprintMsg()) {

                    // suggest trying fingerprint

                    showTransientIndication(R.string.keyguard_try_fingerprint);

                    return;

                }

                showTransientIndication(helpString, false /* isError */, showSwipeToUnlock);
@@ -903,9 +906,11 @@ public class KeyguardIndicationController { 
                return;

            }

            if (biometricSourceType == BiometricSourceType.FACE

                    && shouldSuppressFaceMsg()

                    && shouldSuppressFaceMsgAndShowTryFingerprintMsg()

                    && !mStatusBarKeyguardViewManager.isBouncerShowing()

                    && mKeyguardUpdateMonitor.isScreenOn()) {

                // suggest trying fingerprint

                showTransientIndication(R.string.keyguard_try_fingerprint);

                return;

            }

            if (msgId == FaceManager.FACE_ERROR_TIMEOUT) {
@@ -956,7 +961,7 @@ public class KeyguardIndicationController { 
                    || msgId == FingerprintManager.FINGERPRINT_ERROR_USER_CANCELED);

        }



        private boolean shouldSuppressFaceMsg() {

        private boolean shouldSuppressFaceMsgAndShowTryFingerprintMsg() {

            // For dual biometric, don't show face auth messages

            return mKeyguardUpdateMonitor.isFingerprintDetectionRunning()

                && mKeyguardUpdateMonitor.isUnlockingWithBiometricAllowed(