Merge "Show confirmation dialog when user tries to skip fingerprint" into oc-mr1-dev

2017-08-09 20:15:20 +00:00
parent 298d559c40 bf3a135170
commit 0ed0319005
6 changed files with 262 additions and 2 deletions
--- a/src/com/android/settings/password/SetupSkipDialog.java
+++ b/src/com/android/settings/password/SetupSkipDialog.java
@@ -61,6 +61,7 @@ public class SetupSkipDialog extends InstrumentedDialogFragment
        return new AlertDialog.Builder(getContext())
                .setPositiveButton(R.string.skip_anyway_button_label, this)
                .setNegativeButton(R.string.go_back_button_label, this)
+                .setTitle(R.string.lock_screen_intro_skip_title)
                .setMessage(args.getBoolean(ARG_FRP_SUPPORTED) ?
                        R.string.lock_screen_intro_skip_dialog_text_frp :
                        R.string.lock_screen_intro_skip_dialog_text);