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

Merge "Fix calibrator missing during suw page switch" into main

Browse Source
This commit is contained in:
Milton Wu
2024-01-04 04:51:56 +00:00
committed by Android (Google) Code Review
parent 92ae630598 bb8be99c5c
commit 4f06db7bf8
4 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
View File

@@ -78,7 +78,7 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements
private boolean mIsFolded; private boolean mIsFolded;
private boolean mIsReverseDefaultRotation; private boolean mIsReverseDefaultRotation;
@Nullable @Nullable
private UdfpsEnrollCalibrator mCalibrator; protected UdfpsEnrollCalibrator mCalibrator;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {

2
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
View File

@@ -70,7 +70,7 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction {
private DevicePolicyManager mDevicePolicyManager; private DevicePolicyManager mDevicePolicyManager;
private boolean mCanAssumeUdfps; private boolean mCanAssumeUdfps;
@Nullable @Nullable
private UdfpsEnrollCalibrator mCalibrator; protected UdfpsEnrollCalibrator mCalibrator;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {

6
src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java
View File

@@ -33,6 +33,7 @@ import com.android.settings.R;
import com.android.settings.SetupWizardUtils; import com.android.settings.SetupWizardUtils;
import com.android.settings.biometrics.BiometricUtils; import com.android.settings.biometrics.BiometricUtils;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.flags.Flags;
import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settings.password.ChooseLockSettingsHelper;
public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSensor { public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSensor {
@@ -48,6 +49,11 @@ public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSenso
} }
BiometricUtils.copyMultiBiometricExtras(getIntent(), intent); BiometricUtils.copyMultiBiometricExtras(getIntent(), intent);
SetupWizardUtils.copySetupExtras(getIntent(), intent); SetupWizardUtils.copySetupExtras(getIntent(), intent);
if (Flags.udfpsEnrollCalibration()) {
if (mCalibrator != null) {
intent.putExtras(mCalibrator.getExtrasForNextIntent(true));
}
}
return intent; return intent;
} }

6
src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java
View File

@@ -25,6 +25,7 @@ import android.view.View;
import com.android.settings.SetupWizardUtils; import com.android.settings.SetupWizardUtils;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.android.settings.biometrics.BiometricUtils; import com.android.settings.biometrics.BiometricUtils;
import com.android.settings.flags.Flags;
import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.password.SetupSkipDialog; import com.android.settings.password.SetupSkipDialog;
@@ -46,6 +47,11 @@ public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntrodu
BiometricUtils.getGatekeeperPasswordHandle(getIntent())); BiometricUtils.getGatekeeperPasswordHandle(getIntent()));
} }
SetupWizardUtils.copySetupExtras(getIntent(), intent); SetupWizardUtils.copySetupExtras(getIntent(), intent);
if (Flags.udfpsEnrollCalibration()) {
if (mCalibrator != null) {
intent.putExtras(mCalibrator.getExtrasForNextIntent(false));
}
}
return intent; return intent;
} }