Pass previous calibrator uuid to next fingerprint enroll activity Bug: 318453900 Test: Manully test suw fingerprint flow Change-Id: Iad1e9e1811f58fa880b8d05a722b7fdf57a814fa
111 lines
4.0 KiB
Java
111 lines
4.0 KiB
Java
/*
|
|
* Copyright (C) 2015 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License
|
|
*/
|
|
|
|
package com.android.settings.biometrics.fingerprint;
|
|
|
|
import android.app.Activity;
|
|
import android.app.Dialog;
|
|
import android.app.settings.SettingsEnums;
|
|
import android.content.DialogInterface;
|
|
import android.content.Intent;
|
|
import android.os.Bundle;
|
|
import android.os.UserHandle;
|
|
import android.view.View;
|
|
|
|
import androidx.annotation.NonNull;
|
|
import androidx.appcompat.app.AlertDialog;
|
|
import androidx.fragment.app.FragmentManager;
|
|
|
|
import com.android.settings.R;
|
|
import com.android.settings.SetupWizardUtils;
|
|
import com.android.settings.biometrics.BiometricUtils;
|
|
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
|
|
import com.android.settings.flags.Flags;
|
|
import com.android.settings.password.ChooseLockSettingsHelper;
|
|
|
|
public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSensor {
|
|
|
|
@Override
|
|
protected Intent getFingerprintEnrollingIntent() {
|
|
Intent intent = new Intent(this, SetupFingerprintEnrollEnrolling.class);
|
|
intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);
|
|
intent.putExtra(EXTRA_KEY_CHALLENGE, mChallenge);
|
|
intent.putExtra(EXTRA_KEY_SENSOR_ID, mSensorId);
|
|
if (mUserId != UserHandle.USER_NULL) {
|
|
intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
|
|
}
|
|
BiometricUtils.copyMultiBiometricExtras(getIntent(), intent);
|
|
SetupWizardUtils.copySetupExtras(getIntent(), intent);
|
|
if (Flags.udfpsEnrollCalibration()) {
|
|
if (mCalibrator != null) {
|
|
intent.putExtras(mCalibrator.getExtrasForNextIntent(true));
|
|
}
|
|
}
|
|
return intent;
|
|
}
|
|
|
|
@Override
|
|
protected void onSkipButtonClick(View view) {
|
|
new SkipFingerprintDialog().show(getSupportFragmentManager());
|
|
}
|
|
|
|
@Override
|
|
public int getMetricsCategory() {
|
|
return SettingsEnums.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 SettingsEnums.DIALOG_FINGERPRINT_SKIP_SETUP;
|
|
}
|
|
|
|
@Override
|
|
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
|
return onCreateDialogBuilder().create();
|
|
}
|
|
|
|
@NonNull
|
|
public AlertDialog.Builder onCreateDialogBuilder() {
|
|
return new AlertDialog.Builder(getActivity(), R.style.Theme_AlertDialog)
|
|
.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.setup_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);
|
|
}
|
|
}
|
|
}
|