summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings
diff options
context:
space:
mode:
authorMaurice Lam <yukl@google.com>2015-09-02 23:35:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-09-02 23:35:15 +0000
commitd8723073bb802c0e75df20edbada5e47bd020057 (patch)
treedeaa7e2b57b885ae00219922cde3c73b3331ae12 /src/com/android/settings
parent05c7dde1f3a6044db7b687dfcbacbde50f3befb1 (diff)
parentdf65e153e69a1b18a1aab61795bb9f12110096ee (diff)
downloadpackages_apps_Settings-d8723073bb802c0e75df20edbada5e47bd020057.zip
packages_apps_Settings-d8723073bb802c0e75df20edbada5e47bd020057.tar.gz
packages_apps_Settings-d8723073bb802c0e75df20edbada5e47bd020057.tar.bz2
Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev
Diffstat (limited to 'src/com/android/settings')
-rw-r--r--src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java
index 17f48ce..b57bb8d 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) {