Merge "Change preference title if Active Unlock enabled" into udc-dev am: 42deb763e0 am: 60419e72bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997141 Change-Id: I8201e20c39ef02beebb117731b7ed9dcc105bae9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -818,6 +818,10 @@
|
||||
<string name="biometric_settings_intro_with_fingerprint">You can unlock with your watch when your fingerprint isn\u2019t recognized.</string>
|
||||
<!-- Introduction shown in face page to explain that watch unlock can be used if face isn't recognized. [CHAR LIMIT=NONE]-->
|
||||
<string name="biometric_settings_intro_with_face">You can unlock with your watch when your face isn\u2019t recognized.</string>
|
||||
<string name="biometric_settings_use_fingerprint_or_watch_for"> Use fingerprint or watch to</string>
|
||||
<string name="biometric_settings_use_face_or_watch_for"> Use face or watch to</string>
|
||||
<string name="biometric_settings_use_face_fingerprint_or_watch_for"> Use face, fingerprint, or watch to</string>
|
||||
<string name="biometric_settings_use_watch_for"> Use watch to</string>
|
||||
<!-- Message for a biometric preference toggle, indicating that an action can only be performed by using Face Unlock or Watch Unlock. [CHAR LIMIT=50] -->
|
||||
<string name="biometric_settings_use_face_or_watch_preference_summary">Using face or watch</string>
|
||||
<!-- Message for a biometric preference toggle, indicating that an action can only be performed by using Fingerprint Unlock or Watch Unlock. [CHAR LIMIT=50] -->
|
||||
|
||||
Reference in New Issue
Block a user