From 00dfcd83dc9acab5a49d24773bd23d5969257b36 Mon Sep 17 00:00:00 2001 From: Diya Bera Date: Mon, 9 Jan 2023 23:52:34 +0000 Subject: [PATCH] Fixes background color in SUW fingerprint enrollment Test: Manual (Enroll fingerprint in SUW, background color remains the same) Bug: 246231650 Bug: 250464527 Change-Id: Iffd1543d8b230199c3b925c6538bd418a381c96a --- .../android/settings/biometrics/BiometricUtils.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/biometrics/BiometricUtils.java b/src/com/android/settings/biometrics/BiometricUtils.java index 4cd2f790620..9cc656cda23 100644 --- a/src/com/android/settings/biometrics/BiometricUtils.java +++ b/src/com/android/settings/biometrics/BiometricUtils.java @@ -39,6 +39,7 @@ import com.android.settings.SetupWizardUtils; import com.android.settings.biometrics.face.FaceEnrollIntroduction; import com.android.settings.biometrics.fingerprint.FingerprintEnrollFindSensor; import com.android.settings.biometrics.fingerprint.FingerprintEnrollIntroduction; +import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollFindSensor; import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollIntroduction; import com.android.settings.password.ChooseLockGeneric; import com.android.settings.password.ChooseLockSettingsHelper; @@ -152,9 +153,13 @@ public class BiometricUtils { */ public static Intent getFingerprintFindSensorIntent(@NonNull Context context, @NonNull Intent activityIntent) { - Intent intent = new Intent(context, FingerprintEnrollFindSensor.class); - SetupWizardUtils.copySetupExtras(activityIntent, intent); - return intent; + if (WizardManagerHelper.isAnySetupWizard(activityIntent)) { + Intent intent = new Intent(context, SetupFingerprintEnrollFindSensor.class); + SetupWizardUtils.copySetupExtras(activityIntent, intent); + return intent; + } else { + return new Intent(context, FingerprintEnrollFindSensor.class); + } } /**