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

Modified Fp -> Face setup flow

Browse Source 
Test: Skip FP, Enroll Face, hit back button, observe that you will go
back to Fingerprint enrollment.
Test: Verify that after completing a biometric enroll we no longer
show the introduction activity with a "Done" button.
Fixes: 229813512

Change-Id: Ie0d7ce5d5cef084b3614afce10e05dc72c86b492
This commit is contained in:
Joshua McCloskey
2022-04-21 00:25:07 +00:00
parent 7fe08d0272
commit 10d0cd52d6
7 changed files with 82 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
View File

@@ -302,6 +302,7 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
// TODO(b/229924331): Add tests for the enrollment flows.
final boolean cameFromMultiBioFpAuthAddAnother =
requestCode == BiometricUtils.REQUEST_ADD_ANOTHER
&& BiometricUtils.isMultiBiometricFingerprintEnrollmentFlow(this);
@@ -397,14 +398,20 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
return isResultSkipped(resultCode) || isResultFinished(resultCode);
}
private void handleBiometricResultSkipOrFinished(int resultCode, @Nullable Intent data) {
protected void removeEnrollNextBiometric() {
getIntent().removeExtra(MultiBiometricEnrollHelper.EXTRA_ENROLL_AFTER_FACE);
getIntent().removeExtra(MultiBiometricEnrollHelper.EXTRA_ENROLL_AFTER_FINGERPRINT);
}
protected void removeEnrollNextBiometricIfSkipEnroll(@Nullable Intent data) {
if (data != null
&& data.getBooleanExtra(
MultiBiometricEnrollHelper.EXTRA_SKIP_PENDING_ENROLL, false)) {
getIntent().removeExtra(MultiBiometricEnrollHelper.EXTRA_ENROLL_AFTER_FACE);
getIntent().removeExtra(MultiBiometricEnrollHelper.EXTRA_ENROLL_AFTER_FINGERPRINT);
removeEnrollNextBiometric();
}
}
protected void handleBiometricResultSkipOrFinished(int resultCode, @Nullable Intent data) {
removeEnrollNextBiometricIfSkipEnroll(data);
if (resultCode == RESULT_SKIP) {
onEnrollmentSkipped(data);
} else if (resultCode == RESULT_FINISHED) {