From 0c4bf9b2bc2e8b982ffc88241c1b5ca562991888 Mon Sep 17 00:00:00 2001
From: Kevin Chyn <kchyn@google.com>
Date: Thu, 2 May 2019 16:59:12 -0700
Subject: [PATCH] Update face settings to match mocks

Test: Builds

Fixes: 131660440
Change-Id: Ie75b67428be1e0504e3121bccb68f61e1fdbdb44
---
 res/values/strings.xml             | 21 +++++++++++----------
 res/xml/security_settings_face.xml |  3 ++-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4cb495dc02..e770d3c4bf 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -933,26 +933,27 @@
     <!-- Button text to exit face wizard after everything is done [CHAR LIMIT=15] -->
     <string name="security_settings_face_enroll_done">Done</string>
     <!-- Title for a category shown for the face settings page. [CHAR LIMIT=20] -->
-    <string name="security_settings_face_settings_use_face_category">Use your face for</string>
+    <string name="security_settings_face_settings_use_face_category">Use face unlock for</string>
     <!-- Text shown on a toggle which allows or disallows the device to use face for unlocking the device. [CHAR LIMIT=20] -->
-    <string name="security_settings_face_settings_use_face_unlock_phone">Unlocking your device</string>
+    <string name="security_settings_face_settings_use_face_unlock_phone">Unlocking your phone</string>
     <!-- Text shown on a toggle which allows or disallows the device to use face authentication for apps. This will be presented to the user together with the context of security_settings_face_settings_use_face_category. [CHAR LIMIT=30] -->
     <string name="security_settings_face_settings_use_face_for_apps">App sign-in \u0026 payments</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">Require for face unlock</string>
     <!-- Text shown on a toggle which disables/enables face authentication, depending if the user's eyes are open. [CHAR LIMIT=30] -->
-    <string name="security_settings_face_settings_require_attention">Eyes open to unlock</string>
+    <string name="security_settings_face_settings_require_attention">Open eyes looking at screen</string>
     <!-- Text shown on the details of a toggle which disables/enables face authentication, depending if the user's eyes are open. [CHAR LIMIT=70] -->
-    <string name="security_settings_face_settings_require_attention_details">When using face authentication, your eyes must be open</string>
+    <string name="security_settings_face_settings_require_attention_details">To unlock the phone, always require looking at the screen with your eyes open</string>
     <!-- When authenticating in apps, always require confirmation (e.g. confirm button) after a face is authenticated. [CHAR LIMIT=50] -->
-    <string name="security_settings_face_settings_require_confirmation">Always require confirmation</string>
+    <string name="security_settings_face_settings_require_confirmation">Confirm button</string>
     <!-- When authenticating in apps, always require confirmation (e.g. confirm button) after a face is authenticated. [CHAR LIMIT=70] -->
-    <string name="security_settings_face_settings_require_confirmation_details">When authenticating in apps, always require confirmation</string>
+    <string name="security_settings_face_settings_require_confirmation_details">When authenticating for apps, always require confirmation</string>
     <!-- Button text in face settings which removes the user's faces from the device [CHAR LIMIT=20] -->
-    <string name="security_settings_face_settings_remove_face_data">Remove face data</string>
+    <string name="security_settings_face_settings_remove_face_data">Delete face data</string>
     <!-- Button text in face settings which lets the user enroll their face [CHAR LIMIT=40] -->
-    <string name="security_settings_face_settings_enroll">Set up face authentication</string>
+    <string name="security_settings_face_settings_enroll">Set up new face unlock</string>
     <!-- Text shown in face settings explaining what your face can be used for. [CHAR LIMIT=NONE] -->
-    <string name="security_settings_face_settings_footer">Your face can be used to unlock your device and access apps.
-        <annotation id="url">Learn more</annotation></string>
+    <string name="security_settings_face_settings_footer">Use Face unlock to unlock your device, sign in to apps, and confirm payments.\n\nKeep in mind:\nLooking at the phone can unlock it when you don\u2019t intend to.\n\nYour phone can be unlocked by someone else if it\u2019s held up to your face while your eyes are open.\n\nYour phone can be unlocked by someone who looks a lot like you, say, your child or an identical sibling.</string>
     <!-- Dialog title shown when the user removes an enrollment [CHAR LIMIT=35] -->
     <string name="security_settings_face_settings_remove_dialog_title">Delete face data?</string>
     <!-- Dialog contents shown when the user removes an enrollment [CHAR LIMIT=NONE] -->
diff --git a/res/xml/security_settings_face.xml b/res/xml/security_settings_face.xml
index 39bf73b5e6..fc812f465f 100644
--- a/res/xml/security_settings_face.xml
+++ b/res/xml/security_settings_face.xml
@@ -42,7 +42,8 @@
     </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">
         <SwitchPreference
             android:key="security_settings_face_require_attention"
             android:title="@string/security_settings_face_settings_require_attention"
-- 
2.11.0