Merge "Adding product string variants on choose lock page" into tm-qpr-dev am: a301ba8a68
am: 40fccabd62
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20853551 Change-Id: I03a3823880db1400d7bd63d7edf04a2b46411cca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -1035,7 +1035,11 @@
|
|||||||
<!-- Title for preference that guides the user to skip fingerprint setup [CHAR LIMIT=60]-->
|
<!-- Title for preference that guides the user to skip fingerprint setup [CHAR LIMIT=60]-->
|
||||||
<string name="fingerprint_unlock_skip_fingerprint">Continue without fingerprint</string>
|
<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]-->
|
<!-- 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>
|
<string name="fingerprint_unlock_title" product="default">You can unlock your phone using your fingerprint. For security, this option requires a backup screen lock.</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" product="tablet">You can unlock your tablet using your fingerprint. For security, this option requires a backup screen lock.</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" product="device">You can unlock your device 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]-->
|
<!-- 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>
|
<string name="face_unlock_set_unlock_pattern">Face Unlock + Pattern</string>
|
||||||
@@ -1046,7 +1050,11 @@
|
|||||||
<!-- Title for preference that guides the user to skip Face Unlock setup [CHAR LIMIT=60]-->
|
<!-- 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>
|
<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] -->
|
<!-- 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>
|
<string name="face_unlock_title" product="default">You can unlock your phone using your face. For security, this option requires a backup screen lock.</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" product="tablet">You can unlock your tablet using your face. For security, this option requires a backup screen lock.</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" product="device">You can unlock your device 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]-->
|
<!-- 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">Pattern \u2022 Face \u2022 Fingerprint</string>
|
<string name="biometrics_unlock_set_unlock_pattern">Pattern \u2022 Face \u2022 Fingerprint</string>
|
||||||
@@ -1057,7 +1065,11 @@
|
|||||||
<!-- Title for preference that guides the user to skip face unlock setup [CHAR LIMIT=60]-->
|
<!-- Title for preference that guides the user to skip face unlock setup [CHAR LIMIT=60]-->
|
||||||
<string name="biometrics_unlock_skip_biometrics">Continue without face or fingerprint</string>
|
<string name="biometrics_unlock_skip_biometrics">Continue without face or fingerprint</string>
|
||||||
<!-- Message shown in screen lock picker while setting up the new screen lock with biometrics option. [CHAR LIMIT=NONE] -->
|
<!-- 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 face or fingerprint. For security, this option requires a backup screen lock.</string>
|
<string name="biometrics_unlock_title" product="default">You can unlock your phone using your face or fingerprint. For security, this option requires a backup screen lock.</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" product="tablet">You can unlock your tablet using your face or fingerprint. For security, this option requires a backup screen lock.</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" product="device">You can unlock your device using your face or fingerprint. For security, this option requires a backup screen lock.</string>
|
||||||
|
|
||||||
<!-- Summary for "Configure lockscreen" when lock screen is off [CHAR LIMIT=45] -->
|
<!-- Summary for "Configure lockscreen" when lock screen is off [CHAR LIMIT=45] -->
|
||||||
<string name="unlock_set_unlock_mode_off">None</string>
|
<string name="unlock_set_unlock_mode_off">None</string>
|
||||||
|
Reference in New Issue
Block a user