From a3397cbbccd4c2e100a1226a34224c6db6c3ed03 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Fri, 5 Aug 2016 12:06:05 -0700
Subject: [PATCH] Use different text in fingeprint intro for SUW

Bug: 30681287
Change-Id: Idd03b96c9447523f3128e559be213d89691f4ce1
---
 res/layout/fingerprint_enroll_introduction.xml              | 1 +
 res/values/strings.xml                                      | 2 ++
 .../fingerprint/SetupFingerprintEnrollIntroduction.java     | 6 ++++++
 3 files changed, 9 insertions(+)

diff --git a/res/layout/fingerprint_enroll_introduction.xml b/res/layout/fingerprint_enroll_introduction.xml
index 2c0e7de7ac4..2348b6a6dee 100644
--- a/res/layout/fingerprint_enroll_introduction.xml
+++ b/res/layout/fingerprint_enroll_introduction.xml
@@ -29,6 +29,7 @@
         android:orientation="vertical">
 
         <com.android.setupwizardlib.view.RichTextView
+            android:id="@+id/description_text"
             style="@style/SuwDescription.Glif"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 68691de66db..6a3019f9194 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -748,6 +748,8 @@
     <string name="security_settings_fingerprint_enroll_introduction_title">Unlock with 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.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN.</string>
+    <!-- Introduction detail message shown in fingerprint enrollment screen in setup wizard. [CHAR LIMIT=NONE]-->
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup">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.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN.</string>
     <!-- Button text to cancel enrollment from the introduction [CHAR LIMIT=22] -->
     <string name="security_settings_fingerprint_enroll_introduction_cancel">Cancel</string>
     <!-- Button text to continue to the next screen from the introduction [CHAR LIMIT=22] -->
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
index cc8e823e673..e7f4cfefc33 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
@@ -20,6 +20,7 @@ import android.content.Intent;
 import android.content.res.Resources;
 import android.os.UserHandle;
 import android.widget.Button;
+import android.widget.TextView;
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.internal.widget.LockPatternUtils;
@@ -52,6 +53,11 @@ public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntrodu
     @Override
     protected void initViews() {
         super.initViews();
+
+        TextView description = (TextView) findViewById(R.id.description_text);
+        description.setText(
+                R.string.security_settings_fingerprint_enroll_introduction_message_setup);
+
         Button nextButton = getNextButton();
         nextButton.setText(
                 R.string.security_settings_fingerprint_enroll_introduction_continue_setup);