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

Merge "Update strings for skip fingerprint setup" into oc-mr1-dev

Browse Source 
am: 719d80e6e0

Change-Id: I844147fa567fd168dbf14effb746d96aee12ad3a
This commit is contained in:
Ajay Nadathur
2017-08-11 17:21:24 +00:00
committed by android-build-merger
parent e54e3de80c 719d80e6e0
commit aec29ee4be
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -835,9 +835,9 @@
<!-- Button text to continue to the next screen from the introduction (this string variant is used while in setup wizard) [CHAR LIMIT=22] -->
<string name="security_settings_fingerprint_enroll_introduction_continue_setup">Next</string>
<!-- Title of dialog shown when the user tries to skip setting up fingerprint after adding lock screen during initial setup. [CHAR LIMIT=30] -->
<string name="fingerprint_enroll_skip_after_adding_lock_title">Skip fingerprint setup?</string>
<string name="setup_fingerprint_enroll_skip_title">Skip fingerprint?</string>
<!-- Body text of dialog shown when the user tries to skip setting up fingerprint after adding lock screen during initial setup [CHAR LIMIT=NONE] -->
<string name="fingerprint_enroll_skip_after_adding_lock_text">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>
<string name="setup_fingerprint_enroll_skip_after_adding_lock_text">Fingerprint setup only takes a minute or two. If you skip this, you can add your fingerprint later in settings.</string>
<!-- Title of dialog shown when the user tries to skip setting up a screen lock, warning them of potential consequences of not doing so [CHAR LIMIT=30]-->
<string name="lock_screen_intro_skip_title">Skip screen lock?</string>
<!-- Dialog text shown when the user tries to skip setting up a screen lock, warning them of potential consequences of not doing so, including loss of factory reset protection. (tablet) [CHAR LIMIT=NONE] -->
@@ -1381,7 +1381,7 @@
<!-- Label for ChoosePassword/PIN OK button -->
<string name="lockpassword_cancel_label">Cancel</string>
<!-- Label for ChoosePassword/PIN OK button -->
<!-- Label for ChoosePassword/PIN Clear button that clears all text entered by the user so far. -->
<string name="lockpassword_clear_label">Clear</string>
<!-- Label for LockPatternTutorial Cancel button -->

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

@@ -78,10 +78,10 @@ public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSenso
@NonNull
public AlertDialog.Builder onCreateDialogBuilder() {
return new AlertDialog.Builder(getContext())
.setTitle(R.string.fingerprint_enroll_skip_after_adding_lock_title)
.setTitle(R.string.setup_fingerprint_enroll_skip_title)
.setPositiveButton(R.string.skip_anyway_button_label, this)
.setNegativeButton(R.string.go_back_button_label, this)
.setMessage(R.string.fingerprint_enroll_skip_after_adding_lock_text);
.setMessage(R.string.setup_fingerprint_enroll_skip_after_adding_lock_text);
}
@Override

2
tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensorTest.java
View File

@@ -95,7 +95,7 @@ public class SetupFingerprintEnrollFindSensorTest {
AlertDialog alertDialog = ShadowAlertDialog.getLatestAlertDialog();
assertNotNull(alertDialog);
ShadowAlertDialog shadowAlertDialog = Shadows.shadowOf(alertDialog);
int titleRes = R.string.fingerprint_enroll_skip_after_adding_lock_title;
int titleRes = R.string.setup_fingerprint_enroll_skip_title;
assertEquals(application.getString(titleRes), shadowAlertDialog.getTitle());
}