PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use correct string for Face Unlock preference category" into sc-dev am: 4de89a9361

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085245

Change-Id: I915e1b3e6623a30fb3fd9be75bccdb5c13c359a9
This commit is contained in:
Curtis Belmonte
2021-06-24 17:58:07 +00:00
committed by Automerger Merge Worker
parent c017fdda03 4de89a9361
commit e3c31297b2
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -851,8 +851,6 @@
<string name="security_settings_face_enroll_improve_face_alert_body_fingerprint">Delete your current face model to set up Face Unlock again.\n\nYour face model will be permanently and securely deleted.\n\nAfter deletion, you will need your fingerprint, PIN, pattern, or password to unlock your phone or for authentication in apps.</string> <string name="security_settings_face_enroll_improve_face_alert_body_fingerprint">Delete your current face model to set up Face Unlock again.\n\nYour face model will be permanently and securely deleted.\n\nAfter deletion, you will need your fingerprint, PIN, pattern, or password to unlock your phone or for authentication in apps.</string>
<!-- Title for a category shown for the face settings page. [CHAR LIMIT=20] --> <!-- Title for a category shown for the face settings page. [CHAR LIMIT=20] -->
<string name="security_settings_face_settings_use_face_category">Use Face Unlock for</string> <string name="security_settings_face_settings_use_face_category">Use Face Unlock for</string>
<!-- Title for a category shown for the face settings page, followed by items that the user can toggle on/off to require/disable. -->
<string name="security_settings_face_settings_require_category">Requirements for Face Unlock</string>
<!-- Title for a category shown for the face settings page, followed by items that the user can toggle on/off to require/disable. [CHAR LIMIT=50] --> <!-- Title for a category shown for the face settings page, followed by items that the user can toggle on/off to require/disable. [CHAR LIMIT=50] -->
<string name="security_settings_face_settings_preferences_category">When using Face Unlock</string> <string name="security_settings_face_settings_preferences_category">When using Face Unlock</string>
<!-- Text shown on a toggle which disables/enables face unlock, depending if the user's eyes are open. [CHAR LIMIT=30] --> <!-- Text shown on a toggle which disables/enables face unlock, depending if the user's eyes are open. [CHAR LIMIT=30] -->

2
res/xml/security_settings_face.xml
View File

@@ -43,7 +43,7 @@
<PreferenceCategory <PreferenceCategory
android:key="security_settings_face_manage_category" android:key="security_settings_face_manage_category"
android:title="@string/security_settings_face_settings_require_category"> android:title="@string/security_settings_face_settings_preferences_category">
<SwitchPreference <SwitchPreference
android:key="security_settings_face_require_attention" android:key="security_settings_face_require_attention"
android:title="@string/security_settings_face_settings_require_attention" android:title="@string/security_settings_face_settings_require_attention"