From df65e153e69a1b18a1aab61795bb9f12110096ee Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Wed, 2 Sep 2015 14:36:19 -0700
Subject: [PATCH] [Fingerprint] Update strings for skip dialog

Bug: 23228889
Change-Id: I6c85dccbda2b5c0ad44ac72ca4107f9dcbb6a1b5
---
 res/values/strings.xml                                        | 4 +---
 .../settings/fingerprint/SetupFingerprintEnrollEnrolling.java | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 48aa3c21893..f693b71b2a2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -762,9 +762,7 @@
     <!-- Title of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=40] -->
     <string name="setup_fingerprint_enroll_enrolling_skip_title">Skip fingerprint setup?</string>
     <!-- Content of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=NONE] -->
-    <string name="setup_fingerprint_enroll_enrolling_skip_message">To set up fingerprint access, stay on this screen and follow the instructions.</string>
-    <!-- Label of the button for the user to stay on fingerprint setup screen [CHAR LIMIT=20] -->
-    <string name="setup_fingerprint_enroll_enrolling_stay_button">Stay</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message">You\u2019ve chosen to use your fingerprint as one way to unlock your phone. If you skip now, you\u2019ll need to set this up later. Setup takes only a minute or so.</string>
 
     <!-- Button text to setup screen lock in onboard dialog [CHAR LIMIT=34] -->
     <string name="security_settings_fingerprint_enroll_setup_screen_lock">Set up screen lock</string>
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java
index 17f48ce5e93..b57bb8d8695 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java
@@ -106,7 +106,7 @@ public class SetupFingerprintEnrollEnrolling extends FingerprintEnrollEnrolling
                     .setTitle(R.string.setup_fingerprint_enroll_enrolling_skip_title)
                     .setMessage(R.string.setup_fingerprint_enroll_enrolling_skip_message)
                     .setCancelable(false)
-                    .setPositiveButton(R.string.skip_label,
+                    .setPositiveButton(R.string.wifi_skip_anyway,
                             new DialogInterface.OnClickListener() {
                                 @Override
                                 public void onClick(DialogInterface dialog, int id) {
@@ -117,7 +117,7 @@ public class SetupFingerprintEnrollEnrolling extends FingerprintEnrollEnrolling
                                     }
                                 }
                             })
-                    .setNegativeButton(R.string.setup_fingerprint_enroll_enrolling_stay_button,
+                    .setNegativeButton(R.string.wifi_dont_skip,
                             new DialogInterface.OnClickListener() {
                                 @Override
                                 public void onClick(DialogInterface dialog, int id) {