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

Commit 81ab030e 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 am: dc071e94 

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



Change-Id: I18729fd0f253008a29d9da947e833cab42238efd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dc0f04d7 dc071e94

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

+8 −3
Original line number Diff line number Diff line
@@ -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);

        if (WizardManagerHelper.isAnySetupWizard(activityIntent)) {

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

            SetupWizardUtils.copySetupExtras(activityIntent, intent);

            return intent;

        } else {

            return new Intent(context, FingerprintEnrollFindSensor.class);

        }

    }



    /**