Merge "2/n: Add default implementation for multi-biometric enroll"
This commit is contained in:
Kevin Chyn
Android (Google) Code Review
@@ -148,6 +148,13 @@
|
||||
<attr name="thickness" format="dimension" />
|
||||
</declare-styleable>
|
||||
|
||||
<!-- For biometric enroll checkboxes -->
|
||||
<declare-styleable name="BiometricEnrollCheckbox">
|
||||
<attr name="icon" format="reference" />
|
||||
<attr name="title" format="reference" />
|
||||
<attr name="description" format="reference" />
|
||||
</declare-styleable>
|
||||
|
||||
<!-- For Face enroll accessibility toggle -->
|
||||
<declare-styleable name="FaceEnrollAccessibilityToggle">
|
||||
<attr name="messageText" format="reference" />
|
||||
|
||||
@@ -711,6 +711,26 @@
|
||||
<!-- Summary for Security settings when fingerprint is not supported [CHAR LIMIT=NONE]-->
|
||||
<string name="security_dashboard_summary_no_fingerprint">Screen lock</string>
|
||||
|
||||
<!-- Biometric enrollment for devices with multiple sensors --><skip />
|
||||
<!-- Introduction title shown in biometric enrollment screen for devices that have both fingerprint and face. [CHAR LIMIT=60] -->
|
||||
<string name="multi_biometric_enroll_title">Unlock your phone securely with your face and fingerprint</string>
|
||||
<!-- Introduction subtitle shown in the biometric enrollment screen. [CHAR LIMIT=60] -->
|
||||
<string name="multi_biometric_enroll_subtitle">You can also sign in to apps and confirm payment</string>
|
||||
<!-- Section description preceding the biometric sensors available for the user to select for enrollment. [CHAR LIMIT=40] -->
|
||||
<string name="multi_biometric_enroll_setup_with">Set up unlock with:</string>
|
||||
<!-- Title for a preference containing a checkbox which if selected will allow the user to proceed to set up face unlock. [CHAR LIMIT=32] -->
|
||||
<string name="multi_biometric_enroll_face_unlock_title">Face unlock</string>
|
||||
<!-- Description for a preference containing a checkbox which if selected will allow the user to set up face unlock. [CHAR LIMIT=40] -->
|
||||
<string name="multi_biometric_enroll_face_unlock_description">Make unlocking your phone a breeze</string>
|
||||
<!-- Title for a preference containing a checkbox which if selected will allow the user to proceed to set up fingerprint unlock. [CHAR LIMIT=32] -->
|
||||
<string name="multi_biometric_enroll_fingerprint_unlock_title">Fingerprint</string>
|
||||
<!-- Description for a preference containing a checkbox which if selected will allow the user to set up fingerprint unlock. [CHAR LIMIT=40] -->
|
||||
<string name="multi_biometric_enroll_fingerprint_unlock_description">Save time unlocking phone in your pocket</string>
|
||||
<!-- Button for skipping biometric enrollment. [CHAR LIMIT=30] -->
|
||||
<string name="multi_biometric_enroll_skip">Skip</string>
|
||||
<!-- Button for starting biometric enrollment. [CHAR LIMIT=30] -->
|
||||
<string name="multi_biometric_enroll_next">Next</string>
|
||||
|
||||
<!-- Face enrollment and settings --><skip />
|
||||
<!-- Message shown in summary field when face unlock is set up. [CHAR LIMIT=40] -->
|
||||
<string name="security_settings_face_preference_summary">Face added</string>
|
||||
@@ -865,6 +885,8 @@
|
||||
<string name="security_settings_fingerprint_enroll_introduction_message_setup">Use your fingerprint to unlock your phone or approve purchases.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN.</string>
|
||||
<!-- Button text to cancel enrollment from the introduction [CHAR LIMIT=22] -->
|
||||
<string name="security_settings_fingerprint_enroll_introduction_cancel">Cancel</string>
|
||||
<!-- Button text to cancel enrollment [CHAR LIMIT=30] -->
|
||||
<string name="security_settings_fingerprint_enroll_introduction_no_thanks">No thanks</string>
|
||||
<!-- Button text to continue to the next screen from the introduction [CHAR LIMIT=22] -->
|
||||
<string name="security_settings_fingerprint_enroll_introduction_continue">Continue</string>
|
||||
<!-- Button text to cancel enrollment from the introduction (this string variant is used while in setup wizard) [CHAR LIMIT=22] -->
|
||||
@@ -939,6 +961,12 @@
|
||||
<string name="face_lock_screen_setup_skip_dialog_text" product="device">By protecting your device with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face unlock. To go back, tap Cancel. </string>
|
||||
<!-- Dialog text shown when the user tries to skip setting up a screen lock, warning that they can't continue to set face unlock. (default) [CHAR LIMIT=NONE] -->
|
||||
<string name="face_lock_screen_setup_skip_dialog_text" product="default">By protecting your phone with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face unlock. To go back, tap Cancel.</string>
|
||||
<!-- Dialog text shown when the user tries to skip setting up a screen lock, warning that they can't continue to set biometric unlock. (tablet) [CHAR LIMIT=NONE] -->
|
||||
<string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet">By protecting your tablet with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up biometrics. To go back, tap Cancel. </string>
|
||||
<!-- Dialog text shown when the user tries to skip setting up a screen lock, warning that they can't continue to set biometric unlock. (device) [CHAR LIMIT=NONE] -->
|
||||
<string name="biometrics_lock_screen_setup_skip_dialog_text" product="device">By protecting your device with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up biometrics. To go back, tap Cancel. </string>
|
||||
<!-- Dialog text shown when the user tries to skip setting up a screen lock, warning that they can't continue to set biometric unlock. (default) [CHAR LIMIT=NONE] -->
|
||||
<string name="biometrics_lock_screen_setup_skip_dialog_text" product="default">By protecting your phone with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up biometrics. To go back, tap Cancel.</string>
|
||||
<!-- Title of dialog shown when the user tries to skip setting up a PIN, warning them of potential consequences of not doing so [CHAR LIMIT=48]-->
|
||||
<string name="lock_screen_pin_skip_title">Skip PIN setup?</string>
|
||||
<!-- Title of dialog shown when the user tries to skip setting up a password, warning them of potential consequences of not doing so [CHAR LIMIT=48]-->
|
||||
@@ -1179,11 +1207,8 @@
|
||||
<!-- Description text for screen in setup wizard asking user to set up screen lock, explaining to the user how setting up a screen lock protect them from losing data. (phone) [CHAR LIMIT=NONE] -->
|
||||
<string name="setup_lock_settings_picker_message" product="default">Prevent others from using this phone without your permission by activating device protection features. Choose the screen lock you want to use.</string>
|
||||
|
||||
<!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
|
||||
<string name="lock_settings_picker_fingerprint_message">Choose your backup screen lock method</string>
|
||||
|
||||
<!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for face unlock. Users can choose to use this method to unlock the screen instead of face unlock, or when face unlock is not accepted. [CHAR LIMIT=80] -->
|
||||
<string name="lock_settings_picker_face_message">Choose your backup screen lock method</string>
|
||||
<!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for biometrics. Users can choose to use this method to unlock the screen instead of biometrics, or when biometrics are not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
|
||||
<string name="lock_settings_picker_biometric_message">Choose your backup screen lock method</string>
|
||||
|
||||
<!-- Label for button in screen lock settings, allowing users to choose other types of screen locks. [CHAR LIMIT=40] -->
|
||||
<string name="setup_lock_settings_options_button_label">Screen lock options</string>
|
||||
@@ -1247,34 +1272,37 @@
|
||||
|
||||
<!-- Title for preference that guides the user through creating a backup unlock pattern for fingerprint [CHAR LIMIT=45]-->
|
||||
<string name="fingerprint_unlock_set_unlock_pattern">Fingerprint + Pattern</string>
|
||||
|
||||
<!-- Title for preference that guides the user through creating a backup unlock PIN for fingerprint [CHAR LIMIT=45]-->
|
||||
<string name="fingerprint_unlock_set_unlock_pin">Fingerprint + PIN</string>
|
||||
|
||||
<!-- Title for preference that guides the user through creating a backup unlock password for fingerprint [CHAR LIMIT=45]-->
|
||||
<string name="fingerprint_unlock_set_unlock_password">Fingerprint + Password</string>
|
||||
|
||||
<!-- Title for preference that guides the user to skip fingerprint setup [CHAR LIMIT=60]-->
|
||||
<string name="fingerprint_unlock_skip_fingerprint">Continue without fingerprint</string>
|
||||
|
||||
<!-- Message shown in screen lock picker while setting up the new screen lock with fingerprint option. [CHAR LIMIT=NONE]-->
|
||||
<string name="fingerprint_unlock_title">You can unlock your phone using your fingerprint. For security, this option requires a backup screen lock.</string>
|
||||
|
||||
<!-- Title for preference that guides the user through creating a backup unlock pattern for face unlock [CHAR LIMIT=45]-->
|
||||
<string name="face_unlock_set_unlock_pattern">Face unlock + Pattern</string>
|
||||
|
||||
<!-- Title for preference that guides the user through creating a backup unlock PIN for face unlock [CHAR LIMIT=45]-->
|
||||
<string name="face_unlock_set_unlock_pin">Face unlock + PIN</string>
|
||||
|
||||
<!-- Title for preference that guides the user through creating a backup unlock password for face unlock [CHAR LIMIT=45]-->
|
||||
<string name="face_unlock_set_unlock_password">Face unlock + Password</string>
|
||||
|
||||
<!-- Title for preference that guides the user to skip face unlock setup [CHAR LIMIT=60]-->
|
||||
<string name="face_unlock_skip_face">Continue without face unlock</string>
|
||||
|
||||
<!-- Message shown in screen lock picker while setting up the new screen lock with face unlock option. [CHAR LIMIT=NONE] -->
|
||||
<string name="face_unlock_title">You can unlock your phone using your face. For security, this option requires a backup screen lock.</string>
|
||||
|
||||
<!-- Title for preference that guides the user through creating a backup unlock pattern for biometrics unlock [CHAR LIMIT=45]-->
|
||||
<string name="biometrics_unlock_set_unlock_pattern">Biometrics + Pattern</string>
|
||||
<!-- Title for preference that guides the user through creating a backup unlock PIN for biometrics unlock [CHAR LIMIT=45]-->
|
||||
<string name="biometrics_unlock_set_unlock_pin">Biometrics + PIN</string>
|
||||
<!-- Title for preference that guides the user through creating a backup unlock password for biometrics unlock [CHAR LIMIT=45]-->
|
||||
<string name="biometrics_unlock_set_unlock_password">Biometrics + Password</string>
|
||||
<!-- Title for preference that guides the user to skip face unlock setup [CHAR LIMIT=60]-->
|
||||
<string name="biometrics_unlock_skip_biometrics">Continue without biometrics</string>
|
||||
<!-- Message shown in screen lock picker while setting up the new screen lock with biometrics option. [CHAR LIMIT=NONE] -->
|
||||
<string name="biometrics_unlock_title">You can unlock your phone using your biometrics. For security, this option requires a backup screen lock.</string>
|
||||
|
||||
<!-- Summary for preference that has been disabled by because of the DevicePolicyAdmin, or because device encryption is enabled, or because there are credentials in the credential storage [CHAR LIMIT=50] -->
|
||||
<string name="unlock_set_unlock_disabled_summary">Disabled by admin, encryption policy, or
|
||||
credential storage</string>
|
||||
@@ -4110,6 +4138,15 @@
|
||||
<string name="lockpassword_choose_your_pattern_header_for_face">To use face unlock, set pattern</string>
|
||||
<!-- Header on first screen of choose password/PIN as backup for face unlock flow. If this string cannot be translated in under 40 characters, please translate "Set face unlock backup" [CHAR LIMIT=40] -->
|
||||
<string name="lockpassword_choose_your_pin_header_for_face">To use face unlock, set PIN</string>
|
||||
|
||||
<!-- Header on first screen of choose password/PIN as backup for biometric unlock flow. If this string cannot be translated in under 40 characters, please translate "Set biometric unlock backup" [CHAR LIMIT=40] -->
|
||||
<string name="lockpassword_choose_your_password_header_for_biometrics">To use biometrics, set password</string>
|
||||
<!-- Header on first screen of choose pattern as backup for biometric unlock flow. If this string cannot be translated in under 40 characters, please translate "Set biometric unlock backup" [CHAR LIMIT=40] -->
|
||||
<string name="lockpassword_choose_your_pattern_header_for_biometrics">To use biometrics, set pattern</string>
|
||||
<!-- Header on first screen of choose password/PIN as backup for biometric unlock flow. If this string cannot be translated in under 40 characters, please translate "Set biometric unlock backup" [CHAR LIMIT=40] -->
|
||||
<string name="lockpassword_choose_your_pin_header_for_biometrics">To use biometrics, set PIN</string>
|
||||
|
||||
|
||||
<!-- Text for button that the user should tap when they forgot their work profile password [CHAR LIMIT=40] -->
|
||||
<string name="lockpassword_forgot_password">Forgot your password?</string>
|
||||
<!-- Text for button that the user should tap when they forgot their work profile pattern [CHAR LIMIT=40] -->
|
||||
@@ -9400,6 +9437,14 @@
|
||||
<!-- Message shown on encryption interstitial to ask the user whether or not they want to use a password to encrypt the device while setting up face unlock. [CHAR LIMIT=NONE] -->
|
||||
<string name="encryption_interstitial_message_password_for_face">In addition to using your face to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can\u2019t receive calls, messages, or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require password to start your device?</string>
|
||||
|
||||
<!-- Message shown on encryption interstitial to ask the user whether or not they want to use a PIN to encrypt the device while setting up biometric unlock. [CHAR LIMIT=NONE] -->
|
||||
<string name="encryption_interstitial_message_pin_for_biometrics">In addition to using your biometrics to unlock your device, you can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can\u2019t receive calls, messages, or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require PIN to start your device?</string>
|
||||
<!-- Message shown on encryption interstitial to ask the user whether or not they want to use a pattern to encrypt the device while setting up biometric unlock. [CHAR LIMIT=NONE] -->
|
||||
<string name="encryption_interstitial_message_pattern_for_biometrics">In addition to using your biometrics to unlock your device, you can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can\u2019t receive calls, messages, or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require pattern to start your device?</string>
|
||||
<!-- Message shown on encryption interstitial to ask the user whether or not they want to use a password to encrypt the device while setting up biometric unlock. [CHAR LIMIT=NONE] -->
|
||||
<string name="encryption_interstitial_message_password_for_biometrics">In addition to using your biometrics to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can\u2019t receive calls, messages, or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require password to start your device?</string>
|
||||
|
||||
|
||||
<!-- Button label to say yes to the question of whether to require PIN/password/pattern to start your device. [CHAR LIMIT=20] -->
|
||||
<string name="encryption_interstitial_yes">Yes</string>
|
||||
<!-- Button label to say no to the question of whether to require PIN/password/pattern to start your device. [CHAR LIMIT=20] -->
|
||||
|
||||
@@ -396,13 +396,7 @@
|
||||
<item name="android:gravity">center_vertical</item>
|
||||
</style>
|
||||
|
||||
<style name="FingerprintHeaderStyle" parent="@*android:style/TextAppearance.DeviceDefault.Subhead">
|
||||
<item name="android:paddingTop">16dp</item>
|
||||
<item name="android:textColor">@color/primary_dark_material_light</item>
|
||||
<item name="android:lineSpacingMultiplier">1.2</item>
|
||||
</style>
|
||||
|
||||
<style name="FaceHeaderStyle" parent="@*android:style/TextAppearance.DeviceDefault.Subhead">
|
||||
<style name="BiometricHeaderStyle" parent="@*android:style/TextAppearance.DeviceDefault.Subhead">
|
||||
<item name="android:paddingTop">16dp</item>
|
||||
<item name="android:textColor">@color/primary_dark_material_light</item>
|
||||
<item name="android:lineSpacingMultiplier">1.2</item>
|
||||
|
||||
Reference in New Issue
Block a user