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

Commit fe3db448 authored by Arpan Kaphle's avatar Arpan Kaphle
Browse files

Finalize BiometricPrompt Strings 

Dependent on recent discussions, caused by a modality discussion and a
discussion on the nullability of provider input, this CL aims to
finalize and polish all the strings for the BiometricPrompt flow.

Bug: 330396140
Test: Build and video tests
Change-Id: I983d626363c4ff59fcf8d84ad27b6680d0f0e2c6
parent d3cb706a

packages/CredentialManager/res/values/strings.xml

+1 −7
Original line number Diff line number Diff line
@@ -121,16 +121,10 @@ 
  <string name="get_dialog_title_use_passkey_for">Use your saved passkey for <xliff:g id="app_name" example="YouTube">%1$s</xliff:g></string>

  <!-- This appears as the title of the modal bottom sheet asking for user confirmation to use the single previously saved password to sign in to the app. [CHAR LIMIT=200] -->

  <string name="get_dialog_title_use_password_for">Use your saved password for <xliff:g id="app_name" example="YouTube">%1$s</xliff:g></string>

  <!-- This appears as a description of the modal bottom sheet when the single tap sign in flow is used for the get flow. [CHAR LIMIT=200] -->

  <string name="get_dialog_title_single_tap_for">Use your screen lock to sign in to <xliff:g id="app_name" example="Shrine">%1$s</xliff:g> with <xliff:g id="username" example="beckett-bakery@gmail.com">%2$s</xliff:g></string>

  <!-- This appears as the title of the dialog asking for user confirmation to use the single user credential (previously saved or to be created) to sign in to the app. [CHAR LIMIT=200] -->

  <string name="get_dialog_title_use_sign_in_for">Use your account for <xliff:g id="app_name" example="YouTube">%1$s</xliff:g></string>

  <!-- This appears as the description of the modal bottom sheet asking for user confirmation to use the biometric screen embedded within credential manager for passkey authentication. [CHAR LIMIT=200] -->

  <string name="get_dialog_description_single_tap_passkey">Sign in to <xliff:g id="app_name" example="YouTube">%1$s</xliff:g> with your saved passkey for <xliff:g id="username" example="beckett@gmail.com">%2$s</xliff:g>.</string>

  <!-- This appears as the description of the modal bottom sheet asking for user confirmation to use the biometric screen embedded within credential manager for password authentication. [CHAR LIMIT=200] -->

  <string name="get_dialog_description_single_tap_password">Sign in to <xliff:g id="app_name" example="YouTube">%1$s</xliff:g> with your saved password for <xliff:g id="username" example="beckett@gmail.com">%2$s</xliff:g>.</string>

  <!-- This appears as the description of the modal bottom sheet asking for user confirmation to use the biometric screen embedded within credential manager for saved sign-in authentication. [CHAR LIMIT=200] -->

  <string name="get_dialog_description_single_tap_saved_sign_in">Sign in to <xliff:g id="app_name" example="YouTube">%1$s</xliff:g> with your saved sign-in info for <xliff:g id="username" example="beckett@gmail.com">%2$s</xliff:g>.</string>

  <string name="get_dialog_description_single_tap">Use your screen lock to sign in to <xliff:g id="app_name" example="YouTube">%1$s</xliff:g> with <xliff:g id="username" example="beckett@gmail.com">%2$s</xliff:g></string>

  <!-- This appears as the title of the dialog asking for user confirmation to unlock / authenticate (e.g. via fingerprint, faceId, passcode etc.) so that we can retrieve their sign-in options. [CHAR LIMIT=200] -->

  <string name="get_dialog_title_unlock_options_for">Unlock sign-in options for <xliff:g id="app_name" example="YouTube">%1$s</xliff:g></string>

  <!-- This appears as the title of the dialog asking for user to make a choice from multiple previously saved passkey to sign in to the app. [CHAR LIMIT=200] -->

packages/CredentialManager/src/com/android/credentialmanager/common/BiometricHandler.kt

+1 −11
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import com.android.credentialmanager.getflow.ProviderDisplayInfo 
import com.android.credentialmanager.getflow.RequestDisplayInfo

import com.android.credentialmanager.getflow.generateDisplayTitleTextResCode

import com.android.credentialmanager.model.BiometricRequestInfo

import com.android.credentialmanager.model.CredentialType

import com.android.credentialmanager.model.EntryInfo

import com.android.credentialmanager.model.creation.CreateOptionInfo

import com.android.credentialmanager.model.get.CredentialEntryInfo
@@ -480,16 +479,7 @@ private fun retrieveBiometricGetDisplayValues( 
    )



    descriptionText = context.getString(

        when (singleEntryType) {

            CredentialType.PASSKEY ->

                R.string.get_dialog_description_single_tap_passkey



            CredentialType.PASSWORD ->

                R.string.get_dialog_description_single_tap_password



            CredentialType.UNKNOWN ->

                R.string.get_dialog_description_single_tap_saved_sign_in

        },

        R.string.get_dialog_description_single_tap,

        getRequestDisplayInfo.appName,

        username

    )