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

Commit 4b31bcfe authored by Grace Cheng's avatar Grace Cheng Committed by Android (Google) Code Review
Browse files

Merge "Adds strings and symbols for secure lock device" into main

parents 426c0248 2062e083

core/res/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -3054,6 +3054,8 @@ 
    <string name="keyguard_accessibility_sim_puk_unlock">Sim Puk unlock.</string>

    <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->

    <string name="keyguard_accessibility_password_unlock">Password unlock.</string>

    <!-- Accessibility description of the secure lock device biometric unlock. [CHAR_LIMIT=none] -->

    <string name="keyguard_accessibility_secure_lock_device_biometric_unlock">Biometric unlock for secure lock device.</string>

    <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->

    <string name="keyguard_accessibility_pattern_area">Pattern area.</string>

    <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -4344,6 +4344,7 @@ 


  <java-symbol type="string" name="keyguard_accessibility_pattern_unlock" />

  <java-symbol type="string" name="keyguard_accessibility_pin_unlock" />

  <java-symbol type="string" name="keyguard_accessibility_secure_lock_device_biometric_unlock" />

  <java-symbol type="string" name="keyguard_accessibility_sim_pin_unlock" />

  <java-symbol type="string" name="keyguard_accessibility_sim_puk_unlock" />

  <java-symbol type="string" name="keyguard_accessibility_password_unlock" />

packages/SystemUI/res-keyguard/values/strings.xml

+12 −0
Original line number Diff line number Diff line
@@ -172,6 +172,18 @@ 
    <!-- Message shown when we are on bouncer after Device admin requested lockdown.  [CHAR LIMIT=70] -->

    <string name="kg_prompt_after_dpm_lock">For added security, device was locked by work policy</string>



    <!-- Title shown for pin/pattern/password when we are on bouncer and secure lock device is enabled.  [CHAR LIMIT=70] -->

    <string name="kg_prompt_title_after_secure_lock_device">2-step verification</string>



    <!-- Title shown for the fingerprint auth step when secure lock device is enabled.  [CHAR LIMIT=70] -->

    <string name="kg_prompt_subtitle_for_secure_lock_device_biometric_auth_fingerprint">Use Fingerprint Unlock</string>



    <!-- Title shown for the face auth step when secure lock device is enabled.  [CHAR LIMIT=70] -->

    <string name="kg_prompt_subtitle_for_secure_lock_device_biometric_auth_face">Use Face Unlock</string>



    <!-- Title shown for co-ex auth step when secure lock device is enabled.  [CHAR LIMIT=70] -->

    <string name="kg_prompt_subtitle_for_secure_lock_device_biometric_auth_coex">Use Fingerprint or Face Unlock</string>



    <!-- Message shown for pin/pattern/password when we are on bouncer after user triggered lockdown.  [CHAR LIMIT=70] -->

    <string name="kg_prompt_after_user_lockdown_pin">PIN is required after lockdown</string>

packages/SystemUI/res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -479,6 +479,10 @@ 
    <string name="accessibility_unlock_button">Unlocked</string>

    <!-- Content description of the lock icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_lock_icon">Device locked</string>

    <!-- Content description of the confirm button shown when a passive biometric is authenticated on lock screen and user confirmation is required to unlock the device. [CHAR LIMIT=30] -->

    <string name="accessibility_confirm_biometric_auth_to_unlock">Confirm and unlock the device</string>

    <!-- Content description of the try again button shown when a face auth error occurs on lock screen and user interaction is required to retry auth. [CHAR LIMIT=30] -->

    <string name="accessibility_retry_face_auth">Try Face Unlock again</string>

    <!-- Content description hint of the unlock button when fingerprint is on (not shown on the screen). [CHAR LIMIT=NONE] -->

    <!-- Accessibility action of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->

    <!-- Content description of the Trusted Face icon for accessibility. [CHAR LIMIT=NONE] -->
@@ -1332,6 +1336,8 @@ 
    <!-- Message shown when non-bypass face authentication succeeds. Provides extra instructions for how the user can enter their device [CHAR LIMIT=60] -->

    <string name="keyguard_face_successful_unlock_swipe">Unlocked by face. Swipe up to open.</string>

    <!-- Message shown when non-bypass face authentication succeeds and UDFPS is supported. Provides extra instructions for how the user can enter their device [CHAR LIMIT=60] -->

    <string name="keyguard_face_successful_unlock_confirm_button">Unlocked by face. Press confirm to continue.</string>

    <!-- Message shown when non-bypass face authentication succeeds and UDFPS is supported. Provides extra instructions for how the user can enter their device [CHAR LIMIT=60] -->

    <string name="keyguard_face_successful_unlock_press">Unlocked by face. Press the unlock icon to open.</string>

    <!-- Message shown when non-bypass face authentication succeeds and UDFPS is supported. Provides extra instructions for how the user can enter their device [CHAR LIMIT=60] -->

    <string name="keyguard_face_successful_unlock_press_alt_1">Unlocked by face. Press to open.</string>