Show confirmation dialog when user tries to skip fingerprint
- After the user finished adding lock screen, if the user tries to skip fingerprint setup, show a confirmation dialog bug: 64092225 Test: Manually tested; robolectric tests also added Change-Id: Iba5088a9db93153988942cf78f11077f427e50cb
This commit is contained in:
@@ -139,14 +139,18 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {
|
||||
public void onClick(View v) {
|
||||
switch (v.getId()) {
|
||||
case R.id.skip_button:
|
||||
setResult(RESULT_SKIP);
|
||||
finish();
|
||||
onSkipButtonClick();
|
||||
break;
|
||||
default:
|
||||
super.onClick(v);
|
||||
}
|
||||
}
|
||||
|
||||
protected void onSkipButtonClick() {
|
||||
setResult(RESULT_SKIP);
|
||||
finish();
|
||||
}
|
||||
|
||||
private void proceedToEnrolling(boolean cancelEnrollment) {
|
||||
if (mSidecar != null) {
|
||||
if (cancelEnrollment) {
|
||||
|
@@ -16,12 +16,21 @@
|
||||
|
||||
package com.android.settings.fingerprint;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.AlertDialog;
|
||||
import android.app.Dialog;
|
||||
import android.app.FragmentManager;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
import android.os.UserHandle;
|
||||
import android.support.annotation.NonNull;
|
||||
|
||||
import com.android.internal.logging.nano.MetricsProto;
|
||||
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.SetupWizardUtils;
|
||||
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
|
||||
import com.android.settings.password.ChooseLockSettingsHelper;
|
||||
|
||||
public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSensor {
|
||||
@@ -42,8 +51,54 @@ public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSenso
|
||||
return intent;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onSkipButtonClick() {
|
||||
new SkipFingerprintDialog().show(getFragmentManager());
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMetricsCategory() {
|
||||
return MetricsEvent.FINGERPRINT_FIND_SENSOR_SETUP;
|
||||
}
|
||||
|
||||
public static class SkipFingerprintDialog extends InstrumentedDialogFragment
|
||||
implements DialogInterface.OnClickListener {
|
||||
private static final String TAG_SKIP_DIALOG = "skip_dialog";
|
||||
|
||||
@Override
|
||||
public int getMetricsCategory() {
|
||||
return MetricsProto.MetricsEvent.DIALOG_FINGERPRINT_SKIP_SETUP;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
||||
return onCreateDialogBuilder().create();
|
||||
}
|
||||
|
||||
@NonNull
|
||||
public AlertDialog.Builder onCreateDialogBuilder() {
|
||||
return new AlertDialog.Builder(getContext())
|
||||
.setTitle(R.string.fingerprint_enroll_skip_after_adding_lock_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);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int button) {
|
||||
switch (button) {
|
||||
case DialogInterface.BUTTON_POSITIVE:
|
||||
Activity activity = getActivity();
|
||||
if (activity != null) {
|
||||
activity.setResult(RESULT_SKIP);
|
||||
activity.finish();
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
public void show(FragmentManager manager) {
|
||||
show(manager, TAG_SKIP_DIALOG);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -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);
|
||||
|
Reference in New Issue
Block a user