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

Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev

Browse Source
This commit is contained in:
Maurice Lam
2015-09-02 23:35:15 +00:00
committed by Android (Google) Code Review
parent 05c7dde1f3 df65e153e6
commit d8723073bb
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -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] --> <!-- 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> <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] --> <!-- 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> <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>
<!-- 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>
<!-- Button text to setup screen lock in onboard dialog [CHAR LIMIT=34] --> <!-- 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> <string name="security_settings_fingerprint_enroll_setup_screen_lock">Set up screen lock</string>

4
src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java
View File

@@ -106,7 +106,7 @@ public class SetupFingerprintEnrollEnrolling extends FingerprintEnrollEnrolling
.setTitle(R.string.setup_fingerprint_enroll_enrolling_skip_title) .setTitle(R.string.setup_fingerprint_enroll_enrolling_skip_title)
.setMessage(R.string.setup_fingerprint_enroll_enrolling_skip_message) .setMessage(R.string.setup_fingerprint_enroll_enrolling_skip_message)
.setCancelable(false) .setCancelable(false)
.setPositiveButton(R.string.skip_label, .setPositiveButton(R.string.wifi_skip_anyway,
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int id) { 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() { new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {