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

Commit dc01092e authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Customize Fingerprint Enroll FindSensor Activity" into main

parents 32bc5aab 08b35a87

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

+8 −3
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
package com.android.settings.biometrics;





import static com.android.settings.biometrics.BiometricEnrollActivity.EXTRA_SKIP_INTRO;



import android.annotation.IntDef;

import android.app.Activity;

import android.app.PendingIntent;
@@ -45,8 +47,7 @@ import com.android.settings.R; 
import com.android.settings.SetupWizardUtils;

import com.android.settings.biometrics.face.FaceEnroll;

import com.android.settings.biometrics.fingerprint.FingerprintEnroll;

import com.android.settings.biometrics.fingerprint.FingerprintEnrollFindSensor;

import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollFindSensor;

import com.android.settings.biometrics.fingerprint.FingerprintEnrollActivityClassProvider;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.password.ChooseLockGeneric;

import com.android.settings.password.ChooseLockSettingsHelper;
@@ -252,8 +253,12 @@ public class BiometricUtils { 
    public static Intent getFingerprintFindSensorIntent(@NonNull Context context,

            @NonNull Intent activityIntent) {

        final boolean isSuw =  WizardManagerHelper.isAnySetupWizard(activityIntent);

        FingerprintEnrollActivityClassProvider clsProvider = FeatureFactory

                .getFeatureFactory().getFingerprintFeatureProvider()

                .getEnrollActivityClassProvider(context);

        final Intent intent = new Intent(context, isSuw

                ? SetupFingerprintEnrollFindSensor.class : FingerprintEnrollFindSensor.class);

                ? clsProvider.getSetupSkipIntro() : clsProvider.getSkipIntro());

        intent.putExtra(EXTRA_SKIP_INTRO, true);

        if (isSuw) {

            SetupWizardUtils.copySetupExtras(activityIntent, intent);

        }

src/com/android/settings/biometrics/fingerprint/FingerprintEnrollActivityClassProvider.kt

+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ open class FingerprintEnrollActivityClassProvider { 
        get() = FingerprintEnrollIntroductionInternal::class.java

    open val addAnother: Class<out Activity>

        get() = FingerprintEnrollEnrolling::class.java

    open val setupSkipIntro: Class<out Activity>

        get() = SetupFingerprintEnrollFindSensor::class.java

    open val skipIntro: Class<out Activity>

        get() = FingerprintEnrollFindSensor::class.java



    companion object {

        @JvmStatic