Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 271362af authored by Diya Bera's avatar Diya Bera Committed by Automerger Merge Worker
Browse files

Merge "Fixes background color in SUW fingerprint enrollment" into tm-qpr-dev... 

Merge "Fixes background color in SUW fingerprint enrollment" into tm-qpr-dev am: dc071e94 am: 81ab030e

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20919289



Change-Id: I2d25a70f82548cc1ae754a8b6376fbc831f1f0e8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bc1291e1 81ab030e

src/com/android/settings/biometrics/BiometricUtils.java

+8 −3
Original line number Diff line number Diff line
@@ -42,6 +42,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.biometrics2.ui.view.FingerprintEnrollmentActivity;

import com.android.settings.password.ChooseLockGeneric;
@@ -241,9 +242,13 @@ public class BiometricUtils { 
     */

    public static Intent getFingerprintFindSensorIntent(@NonNull Context context,

            @NonNull Intent activityIntent) {

        Intent intent = new Intent(context, FingerprintEnrollFindSensor.class);

        if (WizardManagerHelper.isAnySetupWizard(activityIntent)) {

            Intent intent = new Intent(context, SetupFingerprintEnrollFindSensor.class);

            SetupWizardUtils.copySetupExtras(activityIntent, intent);

            return intent;

        } else {

            return new Intent(context, FingerprintEnrollFindSensor.class);

        }

    }



    /**