| commit | 031cfcf93ac634858d4939d0d7c8e14c00d8af03 | [log] [tgz] |
|---|---|---|
| author | Milton Wu <mingjuwu@google.com> | Thu Dec 14 03:00:23 2023 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Dec 14 03:00:23 2023 +0000 |
| tree | 43dcdc08597c5346615f3cd5b4b15ae7fa971a41 | |
| parent | d2d3453f8147b35088f3239f8b687b2ac8d5e214 [diff] | |
| parent | 2feaa3fa25fd2820ae50880009c107c1c35f4a40 [diff] |
Merge "Refine calibrator usage" into main
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java index b71330a..059173c 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
@@ -290,6 +290,17 @@ } @Override + protected Intent getFingerprintEnrollingIntent() { + final Intent ret = super.getFingerprintEnrollingIntent(); + if (Flags.udfpsEnrollCalibration()) { + if (mCalibrator != null) { + ret.putExtras(mCalibrator.getExtrasForNextIntent(true)); + } + } + return ret; + } + + @Override public void onBackPressed() { stopLookingForFingerprint(); super.onBackPressed();
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java index bd52b64..aef3c06 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
@@ -385,7 +385,7 @@ } if (Flags.udfpsEnrollCalibration()) { if (mCalibrator != null) { - intent.putExtras(mCalibrator.getExtrasForNextIntent()); + intent.putExtras(mCalibrator.getExtrasForNextIntent(false)); } } return intent;
diff --git a/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollCalibrator.kt b/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollCalibrator.kt index 9809bcc..c54c6b5 100644 --- a/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollCalibrator.kt +++ b/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollCalibrator.kt
@@ -6,7 +6,7 @@ interface UdfpsEnrollCalibrator { - val extrasForNextIntent: Bundle + fun getExtrasForNextIntent(isEnrolling: Boolean): Bundle fun onSaveInstanceState(outState: Bundle)