Update strings for parental consent flow in setup wizard.
Bug: 188847063
Test: manual
Change-Id: I044be874818f6563a47c3f7c8c5011b3cab31ae9
diff --git a/res/drawable/ic_face_enroll_introduction_shield.xml b/res/drawable/ic_face_enroll_introduction_shield.xml
deleted file mode 100644
index 09d3909..0000000
--- a/res/drawable/ic_face_enroll_introduction_shield.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
- ~ Copyright (C) 2019 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
- -->
-
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:aapt="http://schemas.android.com/aapt">
- <aapt:attr name="android:drawable">
- <vector android:height="24dp" android:width="24dp" android:viewportHeight="24"
- android:viewportWidth="24"
- android:tint="?android:attr/colorControlNormal">
- <group android:name="_R_G">
- <group android:name="_R_G_L_0_G">
- <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="#000000"
- android:fillAlpha="1" android:fillType="nonZero"
- android:pathData=" M12 2 C12,2 3.82,5.64 3.82,5.64 C3.82,5.64 3.82,11.09 3.82,11.09 C3.82,16.14 7.31,20.85 12,22 C16.69,20.85 20.18,16.14 20.18,11.09 C20.18,11.09 20.18,5.64 20.18,5.64 C20.18,5.64 12,2 12,2c M18.18 11.09 C18.18,12.64 17.77,14.14 17.08,15.47 C15.77,14.5 13.4,14 12,14 C10.6,14 8.23,14.5 6.92,15.47 C6.23,14.14 5.82,12.64 5.82,11.09 C5.82,11.09 5.82,6.94 5.82,6.94 C5.82,6.94 12,4.19 12,4.19 C12,4.19 18.18,6.94 18.18,6.94 C18.18,6.94 18.18,11.09 18.18,11.09c "/>
- <path android:name="_R_G_L_0_G_D_1_P_0" android:fillColor="#000000"
- android:fillAlpha="1" android:fillType="nonZero"
- android:pathData=" M12 7.5 C13.66,7.5 15,8.84 15,10.5 C15,12.16 13.66,13.5 12,13.5 C10.34,13.5 9,12.16 9,10.5 C9,8.84 10.34,7.5 12,7.5c "/>
- </group>
- </group>
- <group android:name="time_group"/>
- </vector>
- </aapt:attr>
- <target android:name="time_group">
- <aapt:attr name="android:animation">
- <set android:ordering="together">
- <objectAnimator android:propertyName="translateX" android:duration="2000"
- android:startOffset="0" android:valueFrom="0" android:valueTo="1"
- android:valueType="floatType"/>
- </set>
- </aapt:attr>
- </target>
-</animated-vector>
\ No newline at end of file
diff --git a/res/layout/face_enroll_introduction.xml b/res/layout/face_enroll_introduction.xml
index 77a1019..2887bca 100644
--- a/res/layout/face_enroll_introduction.xml
+++ b/res/layout/face_enroll_introduction.xml
@@ -30,7 +30,9 @@
android:layout_height="wrap_content"
android:clipChildren="false"
android:clipToPadding="false"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:layout_marginStart="?attr/sudMarginStart"
+ android:layout_marginEnd="?attr/sudMarginEnd">
<com.google.android.setupdesign.view.RichTextView
android:id="@+id/error_text"
@@ -60,6 +62,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
+ <!-- Keep in mind -->
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -78,19 +81,15 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_face_enroll_introduction_glasses"/>
-
<Space
android:layout_width="16dp"
android:layout_height="wrap_content"/>
-
<TextView
+ android:id="@+id/info_message_glasses"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/security_settings_face_enroll_introduction_info_glasses"
android:textColor="?android:attr/textColorPrimary"
- android:textSize="16sp"
- android:lineSpacingExtra="4sp"/>
-
+ android:textSize="16sp"/>
</LinearLayout>
<LinearLayout
@@ -104,56 +103,28 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_face_enroll_introduction_visibility"/>
-
<Space
android:layout_width="16dp"
android:layout_height="wrap_content"/>
-
<TextView
+ android:id="@+id/info_message_looking"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/security_settings_face_enroll_introduction_info_looking"
android:textColor="?android:attr/textColorPrimary"
- android:textSize="16sp"
- android:lineSpacingExtra="4sp"/>
-
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:paddingTop="24dp">
-
- <ImageView
- android:id="@+id/icon_security"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/ic_face_enroll_introduction_shield"/>
-
- <Space
- android:layout_width="16dp"
- android:layout_height="wrap_content"/>
-
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/security_settings_face_enroll_introduction_info_security"
- android:textColor="?android:attr/textColorPrimary"
- android:textSize="16sp"
- android:lineSpacingExtra="4sp"/>
-
+ android:textSize="16sp"/>
</LinearLayout>
<Space
android:layout_width="match_parent"
android:layout_height="40dp"/>
+ <!-- How it works -->
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/security_settings_face_enroll_introduction_how_title"
android:textColor="?android:attr/textColorPrimary"
+ android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="20sp"/>
<Space
@@ -161,21 +132,21 @@
android:layout_height="24dp"/>
<TextView
+ android:id="@+id/how_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/security_settings_face_enroll_introduction_how_message"
android:textColor="?android:attr/textColorPrimary"
- android:textSize="14sp"
- android:lineSpacingExtra="2sp"/>
+ android:textSize="16sp"/>
<Space
android:layout_width="match_parent"
android:layout_height="24dp"/>
+ <!-- You're in control -->
<TextView
+ android:id="@+id/title_in_control"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/security_settings_face_enroll_introduction_control_title"
android:textColor="?android:attr/textColorPrimary"
android:textSize="20sp"/>
@@ -184,12 +155,11 @@
android:layout_height="24dp"/>
<TextView
+ android:id="@+id/message_in_control"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/security_settings_face_enroll_introduction_control_message"
android:textColor="?android:attr/textColorPrimary"
- android:textSize="14sp"
- android:lineSpacingExtra="2sp"/>
+ android:textSize="16sp"/>
</LinearLayout>
diff --git a/res/layout/fingerprint_enroll_introduction.xml b/res/layout/fingerprint_enroll_introduction.xml
index beac124..65c1497 100644
--- a/res/layout/fingerprint_enroll_introduction.xml
+++ b/res/layout/fingerprint_enroll_introduction.xml
@@ -30,7 +30,9 @@
android:layout_height="wrap_content"
android:clipChildren="false"
android:clipToPadding="false"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:layout_marginStart="?attr/sudMarginStart"
+ android:layout_marginEnd="?attr/sudMarginEnd">
<com.google.android.setupdesign.view.RichTextView
android:id="@+id/error_text"
@@ -52,26 +54,25 @@
</FrameLayout>
+ <!-- Contains the extra information text at the bottom -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<!-- How it works -->
- <com.google.android.setupdesign.view.RichTextView
- style="@style/SudDescription.Glif"
+ <TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textAlignment="viewStart"
- android:paddingTop="12dp"
android:text="@string/security_settings_fingerprint_v2_enroll_introduction_footer_title_2"
- android:textColor="?android:attr/textColorPrimary"/>
+ android:textColor="?android:attr/textColorPrimary"
+ android:textSize="20sp"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:paddingTop="12dp">
+ android:paddingTop="24dp">
<ImageView
android:id="@+id/icon_fingerprint"
@@ -80,125 +81,135 @@
android:contentDescription="@null"
android:src="@drawable/ic_fingerprint_24dp"/>
<Space
- android:layout_width="24dp"
+ android:layout_width="16dp"
android:layout_height="wrap_content"/>
<TextView
+ android:id="@+id/footer_message_2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/security_settings_fingerprint_v2_enroll_introduction_footer_message_2"
- android:textColor="?android:attr/textColorPrimary"/>
+ android:textColor="?android:attr/textColorPrimary"
+ android:textSize="16sp"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:paddingTop="12dp">
+ android:paddingTop="24dp">
<ImageView
- android:id="@+id/icon_locked"
+ android:id="@+id/icon_fingerprint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@null"
android:src="@drawable/ic_device_locked_24dp"/>
<Space
- android:layout_width="24dp"
+ android:layout_width="16dp"
android:layout_height="wrap_content"/>
<TextView
+ android:id="@+id/footer_message_3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/security_settings_fingerprint_v2_enroll_introduction_footer_message_3"
- android:textColor="?android:attr/textColorPrimary"/>
+ android:textColor="?android:attr/textColorPrimary"
+ android:textSize="16sp"/>
</LinearLayout>
+ <Space
+ android:layout_width="match_parent"
+ android:layout_height="24dp"/>
+
<!-- You're in control -->
- <com.google.android.setupdesign.view.RichTextView
- style="@style/SudDescription.Glif"
+ <TextView
+ android:id="@+id/footer_title_1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textAlignment="viewStart"
- android:paddingTop="12dp"
- android:text="@string/security_settings_fingerprint_enroll_introduction_footer_title_1"
- android:textColor="?android:attr/textColorPrimary"/>
+ android:textColor="?android:attr/textColorPrimary"
+ android:textSize="20sp"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:paddingTop="12dp">
+ android:paddingTop="24dp">
<ImageView
- android:id="@+id/icon_delete"
+ android:id="@+id/icon_fingerprint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@null"
android:src="@drawable/ic_trash_can"/>
<Space
- android:layout_width="24dp"
+ android:layout_width="16dp"
+ android:layout_height="wrap_content"/>
+ <TextView
+ android:id="@+id/footer_message_4"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textColor="?android:attr/textColorPrimary"
+ android:textSize="16sp"/>
+ </LinearLayout>
+
+ <Space
+ android:layout_width="match_parent"
+ android:layout_height="24dp"/>
+
+ <!-- Keep in mind -->
+ <TextView
+ android:id="@+id/footer_title_2"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/security_settings_face_enroll_introduction_info_title"
+ android:textColor="?android:attr/textColorPrimary"
+ android:textSize="20sp"/>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:paddingTop="24dp">
+
+ <ImageView
+ android:id="@+id/icon_info"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:contentDescription="@null"
+ android:src="@drawable/ic_info_outline_24dp"/>
+ <Space
+ android:layout_width="16dp"
+ android:layout_height="wrap_content"/>
+ <TextView
+ android:id="@+id/footer_message_5"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textColor="?android:attr/textColorPrimary"
+ android:textSize="16sp"/>
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:paddingTop="24dp">
+
+ <ImageView
+ android:id="@+id/icon_link"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:contentDescription="@null"
+ android:src="@drawable/ic_link_24dp"/>
+ <Space
+ android:layout_width="16dp"
android:layout_height="wrap_content"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/security_settings_fingerprint_v2_enroll_introduction_footer_message_4"
- android:textColor="?android:attr/textColorPrimary"/>
+ android:text="@string/security_settings_fingerprint_v2_enroll_introduction_message_learn_more"
+ android:textColor="?android:attr/textColorPrimary"
+ android:textSize="16sp"/>
</LinearLayout>
</LinearLayout>
- <!-- Keep in mind -->
- <com.google.android.setupdesign.view.RichTextView
- style="@style/SudDescription.Glif"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:textAlignment="viewStart"
- android:paddingTop="12dp"
- android:text="@string/security_settings_fingerprint_enroll_introduction_footer_title_2"
- android:textColor="?android:attr/textColorPrimary"/>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:paddingTop="12dp">
-
- <ImageView
- android:id="@+id/icon_info"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:contentDescription="@null"
- android:src="@drawable/ic_info_outline_24dp"/>
- <Space
- android:layout_width="24dp"
- android:layout_height="wrap_content"/>
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/security_settings_fingerprint_v2_enroll_introduction_footer_message_5"
- android:textColor="?android:attr/textColorPrimary"/>
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:paddingTop="12dp">
-
- <ImageView
- android:id="@+id/icon_link"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:contentDescription="@null"
- android:src="@drawable/ic_link_24dp"/>
- <Space
- android:layout_width="24dp"
- android:layout_height="wrap_content"/>
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/security_settings_fingerprint_v2_enroll_introduction_message_learn_more"
- android:textColor="?android:attr/textColorPrimary"/>
- </LinearLayout>
-
</LinearLayout>
</com.google.android.setupdesign.GlifLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0302461..62ac59d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -783,6 +783,8 @@
<string name="security_settings_face_enroll_introduction_title_unlock_disabled">Use your face to authenticate</string>
<!-- Introduction detail message shown in face enrollment dialog [CHAR LIMIT=NONE]-->
<string name="security_settings_face_enroll_introduction_message">Use your face to unlock your phone, authorize purchases, or sign in to apps.</string>
+ <!-- Introduction detail message shown in face enrollment dialog when asking for parental consent [CHAR LIMIT=NONE]-->
+ <string name="security_settings_face_enroll_introduction_consent_message">Allow your child to use their face to unlock their phone or verify it\u2019s them. This happens when they sign in to apps, approve a purchase, and more.</string>
<!-- Introduction detail message shown in face enrollment dialog, when face unlock is disabled by device admin [CHAR LIMIT=NONE] -->
<string name="security_settings_face_enroll_introduction_message_unlock_disabled">Use your face to unlock your phone or approve purchases.\n\nNote: You can\u2019t use your face to unlock this device. For more information, contact your organization\u2019s admin.</string>
<!-- Introduction detail message shown in face enrollment screen in setup wizard. [CHAR LIMIT=NONE] -->
@@ -791,18 +793,26 @@
<string name="security_settings_face_enroll_introduction_info_title"></string>
<!-- Message on the face enrollment introduction page that provides information about glasses. [CHAR LIMIT=NONE] -->
<string name="security_settings_face_enroll_introduction_info_glasses"></string>
+ <!-- Message on the face enrollment introduction page that provides information about glasses when asking for parental consent. [CHAR LIMIT=NONE] -->
+ <string name="security_settings_face_enroll_introduction_info_consent_glasses"></string>
<!-- Message on the face enrollment introduction page that provides information about what could cause the phone to unlock. [CHAR LIMIT=NONE] -->
<string name="security_settings_face_enroll_introduction_info_looking"></string>
- <!-- Message on the face enrollment introduction page that provides information about the security of face unlock. [CHAR LIMIT=NONE] -->
- <string name="security_settings_face_enroll_introduction_info_security"></string>
+ <!-- Message on the face enrollment introduction page that provides information about what could cause the phone to unlock when asking for parental consent. [CHAR LIMIT=NONE] -->
+ <string name="security_settings_face_enroll_introduction_info_consent_looking"></string>
<!-- Title of a section on the face enrollment introduction page that explains how face unlock works. [CHAR LIMIT=40] -->
<string name="security_settings_face_enroll_introduction_how_title"></string>
<!-- Message on the face enrollment introduction page that explains how face unlock works. [CHAR LIMIT=NONE] -->
<string name="security_settings_face_enroll_introduction_how_message"></string>
+ <!-- Message on the face enrollment introduction page that explains how Face Unlock works when asking for parental consent. [CHAR LIMIT=NONE] -->
+ <string name="security_settings_face_enroll_introduction_how_consent_message"></string>
<!-- Title of a section on the face enrollment introduction page that explains privacy controls for face unlock. [CHAR LIMIT=NONE] -->
<string name="security_settings_face_enroll_introduction_control_title"></string>
+ <!-- Title of a section on the face enrollment introduction page that explains privacy controls for face unlock when asking for parental consent. [CHAR LIMIT=NONE] -->
+ <string name="security_settings_face_enroll_introduction_control_consent_title"></string>
<!-- Message on the face enrollment introduction page that explains privacy controls for face unlock [CHAR LIMIT=NONE] -->
<string name="security_settings_face_enroll_introduction_control_message"></string>
+ <!-- Message on the face enrollment introduction page that explains privacy controls for face unlock when asking for parental consent. [CHAR LIMIT=NONE] -->
+ <string name="security_settings_face_enroll_introduction_control_consent_message"></string>
<!-- Title shown in face enrollment dialog [CHAR LIMIT=40] -->
<string name="security_settings_face_enroll_repeat_title">Center your face in the circle</string>
<!-- Button text to skip enrollment of face [CHAR LIMIT=40] -->
@@ -897,10 +907,14 @@
<!-- Introduction title shown in fingerprint enrollment to introduce the fingerprint feature, when fingerprint unlock is disabled by device admin [CHAR LIMIT=40] -->
<string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled">Use your fingerprint</string>
<!-- Introduction detail message shown in fingerprint enrollment dialog [CHAR LIMIT=NONE]-->
- <string name="security_settings_fingerprint_enroll_introduction_message">Just touch the fingerprint sensor to unlock your phone, authorize purchases, or sign in to apps. Be careful whose fingerprints you add. Even one added print can do any of these things.</string>
+ <string name="security_settings_fingerprint_enroll_introduction_message">Use your fingerprint to unlock your phone or verify it\u2019s you, like when you sign in to apps or approve a purchase.</string>
+ <!-- Introduction detail message shown in fingerprint enrollment dialog when asking for parental consent [CHAR LIMIT=NONE]-->
+ <string name="security_settings_fingerprint_enroll_introduction_consent_message">Allow your child to use their fingerprint to unlock their phone or verify it\u2019s them. This happens when they sign in to apps, approve a purchase, and more.</string>
<!-- Introduction title shown in the bottom of fingerprint enrollment dialog [CHAR LIMIT=NONE]-->
<string name="security_settings_fingerprint_enroll_introduction_footer_title_1">You\u2019re in control</string>
<!-- Introduction title shown in the bottom of fingerprint enrollment dialog [CHAR LIMIT=NONE]-->
+ <string name="security_settings_fingerprint_enroll_introduction_footer_title_consent_1">You and your child are in control</string>
+ <!-- Introduction title shown in the bottom of fingerprint enrollment dialog [CHAR LIMIT=NONE]-->
<string name="security_settings_fingerprint_enroll_introduction_footer_title_2">Keep in mind</string>
<!-- Introduction detail message shown in the bottom of fingerprint enrollment dialog [CHAR LIMIT=NONE]-->
<string name="security_settings_fingerprint_enroll_introduction_footer_message_1">The data recorded by Fingerprint is stored securely and never leaves your phone. You can delete your data anytime in Settings.</string>
@@ -939,13 +953,21 @@
<!-- Introduction subtitle message shown in fingerprint enrollment introduction screen in setup wizard. [CHAR LIMIT=NONE]-->
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_title_2">How it works</string>
<!-- Introduction description message shown in fingerprint enrollment introduction screen in setup wizard. [CHAR LIMIT=NONE]-->
- <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_2">Fingerprint Unlock creates a unique model of your fingerprint to recognize you during authentication. To create this fingerprint model during setup, you will take images of your fingerprint from different positions.</string>
+ <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_2">Fingerprint Unlock creates a unique model of your fingerprint to verify it\u2019s you. To create this fingerprint model during setup, you will take images of your fingerprint from different positions.</string>
+ <!-- Introduction description message shown in fingerprint enrollment introduction screen in setup wizard when asking for parental consent. [CHAR LIMIT=NONE]-->
+ <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_2">Fingerprint Unlock creates a unique model of your child\u2019s fingerprint to verify it\u2019s them. To create this fingerprint model during setup, they will take images of their fingerprint from different positions.</string>
<!-- Introduction description message shown in fingerprint enrollment introduction screen in setup wizard. [CHAR LIMIT=NONE]-->
- <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_3">The phone will also use images from your interactions with Fingerprint Unlock to update your fingerprint model. Images used to create your fingerprint model are never stored, but the fingerprint model is stored securely on your phone and never leaves the phone. All processing occurs securely on your phone.</string>
- <!-- Introduction description message shown in fingerprint enrollment introduction screen in setup wizard. [CHAR LIMIT=NONE]-->
- <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_4">You can delete your fingerprint model, or turn off Fingerprint Unlock at any time in Settings. Fingerprint models are stored on the phone until you delete them.</string>
+ <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_3">When you use Pixel Imprint, images are used to update your fingerprint model. Images used to create your fingerprint model are never stored, but the fingerprint model is stored securely on your phone and never leaves the phone. All processing occurs securely on your phone.</string>
+ <!-- Introduction description message shown in fingerprint enrollment introduction screen in setup wizard when asking for parental consent. [CHAR LIMIT=NONE]-->
+ <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_3">When they use Pixel Imprint, images are used to update their fingerprint model. Images used to create your child\u2019s fingerprint model are never stored, but the fingerprint model is stored securely on the phone and never leaves the phone. All processing occurs securely on the phone.</string>
+ <!-- Introduction description message shown in fingerprint enrollment introduction screen in setup wizard. [CHAR LIMIT=NONE] -->
+ <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_4">You can delete your fingerprint images and model, or turn off Fingerprint Unlock at any time in Settings. Fingerprint images and models are stored on the phone until you delete them.</string>
+ <!-- Introduction description message shown in fingerprint enrollment introduction screen in setup wizard when asking for parental consent. [CHAR LIMIT=NONE] -->
+ <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_4">You and your child can delete their fingerprint images and model, or turn off Fingerprint Unlock at any time in Settings. Fingerprint images and models are stored on the phone until they\u2019re deleted.</string>
<!-- Introduction description message shown in fingerprint enrollment introduction screen in setup wizard. [CHAR LIMIT=NONE] -->
<string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_5">Your phone can be unlocked when you don\u2019t intend to, like if someone holds it up to your finger.</string>
+ <!-- Introduction description message shown in fingerprint enrollment introduction screen in setup wizard when asking for parental consent. [CHAR LIMIT=NONE] -->
+ <string name="security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5">Your child\u2019s phone can be unlocked when they don\u2019t intend to, like if someone holds it up to their finger.</string>
<!-- Introduction detail message shown in fingerprint enrollment introduction to learn more about fingerprint [CHAR LIMIT=NONE]-->
<string name="security_settings_fingerprint_v2_enroll_introduction_message_learn_more"></string>
@@ -965,7 +987,7 @@
<string name="security_settings_fingerprint_v2_enroll_error_max_attempts">You\u2019ve reached the maximum number of attempts</string>
<!-- Message shown in fingerprint security settings home screen. [CHAR LIMIT=NONE]-->
- <string name="security_settings_fingerprint_v2_home_screen">Use your fingerprint to unlock your phone or for authentication, like when you sign in to apps or approve a purchase\n\n<annotation id="url">Learn more</annotation></string>
+ <string name="security_settings_fingerprint_v2_home_screen">Use your fingerprint to unlock your phone or verify it\u2019s you, like when you sign in to apps or approve a purchase.\n\n<annotation id="url">Learn more</annotation></string>
<!-- Biometric settings --><skip />
<!-- Title shown for menu item that launches biometric settings. [CHAR LIMIT=66] -->
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
index fc13a8c..91cc3a9 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
@@ -76,10 +76,19 @@
final ImageView iconGlasses = findViewById(R.id.icon_glasses);
final ImageView iconLooking = findViewById(R.id.icon_looking);
- final ImageView iconSecurity = findViewById(R.id.icon_security);
iconGlasses.getBackground().setColorFilter(getIconColorFilter());
iconLooking.getBackground().setColorFilter(getIconColorFilter());
- iconSecurity.getBackground().setColorFilter(getIconColorFilter());
+
+ final TextView infoMessageGlasses = findViewById(R.id.info_message_glasses);
+ final TextView infoMessageLooking = findViewById(R.id.info_message_looking);
+ final TextView howMessage = findViewById(R.id.how_message);
+ final TextView inControlTitle = findViewById(R.id.title_in_control);
+ final TextView inControlMessage = findViewById(R.id.message_in_control);
+ infoMessageGlasses.setText(getInfoMessageGlasses());
+ infoMessageLooking.setText(getInfoMessageLooking());
+ howMessage.setText(getHowMessage());
+ inControlTitle.setText(getInControlTitle());
+ inControlMessage.setText(getInControlMessage());
mFaceManager = Utils.getFaceManagerOrNull(this);
mFaceFeatureProvider = FeatureFactory.getFactory(getApplicationContext())
@@ -107,6 +116,31 @@
return true;
}
+ @StringRes
+ protected int getInfoMessageGlasses() {
+ return R.string.security_settings_face_enroll_introduction_info_glasses;
+ }
+
+ @StringRes
+ protected int getInfoMessageLooking() {
+ return R.string.security_settings_face_enroll_introduction_info_looking;
+ }
+
+ @StringRes
+ protected int getHowMessage() {
+ return R.string.security_settings_face_enroll_introduction_how_message;
+ }
+
+ @StringRes
+ protected int getInControlTitle() {
+ return R.string.security_settings_face_enroll_introduction_control_title;
+ }
+
+ @StringRes
+ protected int getInControlMessage() {
+ return R.string.security_settings_face_enroll_introduction_control_message;
+ }
+
@Override
protected boolean isDisabledByAdmin() {
return RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollParentalConsent.java b/src/com/android/settings/biometrics/face/FaceEnrollParentalConsent.java
index 8e80b39..1f55d82 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollParentalConsent.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollParentalConsent.java
@@ -19,9 +19,11 @@
import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FACE;
import android.content.Intent;
+import android.os.Bundle;
import android.view.View;
import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
import com.android.settings.R;
@@ -33,6 +35,13 @@
public class FaceEnrollParentalConsent extends FaceEnrollIntroduction {
@Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ setDescriptionText(R.string.security_settings_face_enroll_introduction_consent_message);
+ }
+
+ @Override
protected void onNextButtonClick(View view) {
onConsentResult(true /* granted */);
}
@@ -61,6 +70,36 @@
}
@Override
+ @StringRes
+ protected int getInfoMessageGlasses() {
+ return R.string.security_settings_face_enroll_introduction_info_consent_glasses;
+ }
+
+ @Override
+ @StringRes
+ protected int getInfoMessageLooking() {
+ return R.string.security_settings_face_enroll_introduction_info_consent_looking;
+ }
+
+ @Override
+ @StringRes
+ protected int getHowMessage() {
+ return R.string.security_settings_face_enroll_introduction_how_consent_message;
+ }
+
+ @Override
+ @StringRes
+ protected int getInControlTitle() {
+ return R.string.security_settings_face_enroll_introduction_control_consent_title;
+ }
+
+ @Override
+ @StringRes
+ protected int getInControlMessage() {
+ return R.string.security_settings_face_enroll_introduction_control_consent_message;
+ }
+
+ @Override
protected int getHeaderResDefault() {
return R.string.security_settings_face_enroll_consent_introduction_title;
}
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
index 5142e21..8c3b1ce 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
@@ -64,21 +64,62 @@
super.onCreate(savedInstanceState);
final ImageView iconFingerprint = findViewById(R.id.icon_fingerprint);
- final ImageView iconLocked = findViewById(R.id.icon_locked);
- final ImageView iconDelete = findViewById(R.id.icon_delete);
final ImageView iconInfo = findViewById(R.id.icon_info);
final ImageView iconLink = findViewById(R.id.icon_link);
iconFingerprint.getDrawable().setColorFilter(getIconColorFilter());
- iconLocked.getDrawable().setColorFilter(getIconColorFilter());
- iconDelete.getDrawable().setColorFilter(getIconColorFilter());
iconInfo.getDrawable().setColorFilter(getIconColorFilter());
iconLink.getDrawable().setColorFilter(getIconColorFilter());
+
+ final TextView footerMessage2 = findViewById(R.id.footer_message_2);
+ final TextView footerMessage3 = findViewById(R.id.footer_message_3);
+ final TextView footerMessage4 = findViewById(R.id.footer_message_4);
+ final TextView footerMessage5 = findViewById(R.id.footer_message_5);
+ footerMessage2.setText(getFooterMessage2());
+ footerMessage3.setText(getFooterMessage3());
+ footerMessage4.setText(getFooterMessage4());
+ footerMessage5.setText(getFooterMessage5());
+
+ final TextView footerTitle1 = findViewById(R.id.footer_title_1);
+ final TextView footerTitle2 = findViewById(R.id.footer_title_2);
+ footerTitle1.setText(getFooterTitle1());
+ footerTitle2.setText(getFooterTitle2());
}
+ @StringRes
int getNegativeButtonTextId() {
return R.string.security_settings_fingerprint_enroll_introduction_skip;
}
+ @StringRes
+ protected int getFooterTitle1() {
+ return R.string.security_settings_fingerprint_enroll_introduction_footer_title_1;
+ }
+
+ @StringRes
+ protected int getFooterTitle2() {
+ return R.string.security_settings_fingerprint_enroll_introduction_footer_title_2;
+ }
+
+ @StringRes
+ protected int getFooterMessage2() {
+ return R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_2;
+ }
+
+ @StringRes
+ protected int getFooterMessage3() {
+ return R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_3;
+ }
+
+ @StringRes
+ protected int getFooterMessage4() {
+ return R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_4;
+ }
+
+ @StringRes
+ protected int getFooterMessage5() {
+ return R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_5;
+ }
+
@Override
protected boolean isDisabledByAdmin() {
return RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollParentalConsent.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollParentalConsent.java
index 8920307..5d8cf9b 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollParentalConsent.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollParentalConsent.java
@@ -19,9 +19,11 @@
import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FINGERPRINT;
import android.content.Intent;
+import android.os.Bundle;
import android.view.View;
import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
import com.android.settings.R;
@@ -33,6 +35,14 @@
public class FingerprintEnrollParentalConsent extends FingerprintEnrollIntroduction {
@Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ setDescriptionText(
+ R.string.security_settings_fingerprint_enroll_introduction_consent_message);
+ }
+
+ @Override
protected void onNextButtonClick(View view) {
onConsentResult(true /* granted */);
}
@@ -55,6 +65,34 @@
return true;
}
+ @StringRes
+ @Override
+ protected int getFooterTitle1() {
+ return R.string.security_settings_fingerprint_enroll_introduction_footer_title_consent_1;
+ }
+
+ @StringRes
+ @Override
+ protected int getFooterMessage2() {
+ return R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_2;
+ }
+
+ @StringRes
+ @Override
+ protected int getFooterMessage3() {
+ return R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_3;
+ }
+
+ @StringRes
+ protected int getFooterMessage4() {
+ return R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_4;
+ }
+
+ @StringRes
+ protected int getFooterMessage5() {
+ return R.string.security_settings_fingerprint_v2_enroll_introduction_footer_message_consent_5;
+ }
+
@Override
protected int getHeaderResDefault() {
return R.string.security_settings_fingerprint_enroll_consent_introduction_title;