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

Commit 1b0fb448 authored by Austin Delgado's avatar Austin Delgado Committed by Android (Google) Code Review
Browse files

Merge "Add a new string for SFPS coex" into main

parents b0d259e2 c705e9fa
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -447,6 +447,8 @@
    <string name="biometric_dialog_tap_confirm_with_face_alt_2">Face recognized. Press to continue.</string>
    <!-- Message shown when a biometric has authenticated with a user's face and is waiting for the user to confirm authentication [CHAR LIMIT=60]-->
    <string name="biometric_dialog_tap_confirm_with_face_alt_3">Face recognized. Press the unlock icon to continue.</string>
    <!-- Message shown when a biometric has authenticated with a user's face and is waiting for the user to confirm authentication with SFPS [CHAR LIMIT=60]-->
    <string name="biometric_dialog_tap_confirm_with_face_sfps">Unlocked by face. Tap to continue.</string>
    <!-- Talkback string when a biometric is authenticated [CHAR LIMIT=NONE] -->
    <string name="biometric_dialog_authenticated">Authenticated</string>
    <!-- Talkback string when a canceling authentication [CHAR LIMIT=NONE] -->
+14 −9
Original line number Diff line number Diff line
@@ -580,16 +580,21 @@ class Spaghetti(
        }
    }

    private suspend fun getHelpForSuccessfulAuthentication(
    private fun getHelpForSuccessfulAuthentication(
        authenticatedModality: BiometricModality,
    ): Int? =
        when {
    ): Int? {
        // for coex, show a message when face succeeds after fingerprint has also started
            modalities.hasFaceAndFingerprint &&
                (viewModel.fingerprintStartMode.first() != FingerprintStartMode.Pending) &&
                (authenticatedModality == BiometricModality.Face) ->
                R.string.biometric_dialog_tap_confirm_with_face_alt_1
            else -> null
        if (authenticatedModality != BiometricModality.Face) {
            return null
        }

        if (modalities.hasUdfps) {
            return R.string.biometric_dialog_tap_confirm_with_face_alt_1
        }
        if (modalities.hasSfps) {
            return R.string.biometric_dialog_tap_confirm_with_face_sfps
        }
        return null
    }

    fun onAuthenticationFailed(