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

Merge "Customize Fingerprint Enroll FindSensor Activity" into main

Browse Source
This commit is contained in:
Treehugger Robot
2025-03-24 07:21:29 -07:00
committed by Android (Google) Code Review
parent 32bc5aab59 08b35a8729
commit dc01092e3b
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/biometrics/BiometricUtils.java
View File

@@ -17,6 +17,8 @@
package com.android.settings.biometrics; package com.android.settings.biometrics;
import static com.android.settings.biometrics.BiometricEnrollActivity.EXTRA_SKIP_INTRO;
import android.annotation.IntDef; import android.annotation.IntDef;
import android.app.Activity; import android.app.Activity;
import android.app.PendingIntent; import android.app.PendingIntent;
@@ -45,8 +47,7 @@ import com.android.settings.R;
import com.android.settings.SetupWizardUtils; import com.android.settings.SetupWizardUtils;
import com.android.settings.biometrics.face.FaceEnroll; import com.android.settings.biometrics.face.FaceEnroll;
import com.android.settings.biometrics.fingerprint.FingerprintEnroll; import com.android.settings.biometrics.fingerprint.FingerprintEnroll;
import com.android.settings.biometrics.fingerprint.FingerprintEnrollFindSensor; import com.android.settings.biometrics.fingerprint.FingerprintEnrollActivityClassProvider;
import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollFindSensor;
import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.FeatureFactory;
import com.android.settings.password.ChooseLockGeneric; import com.android.settings.password.ChooseLockGeneric;
import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settings.password.ChooseLockSettingsHelper;
@@ -252,8 +253,12 @@ public class BiometricUtils {
public static Intent getFingerprintFindSensorIntent(@NonNull Context context, public static Intent getFingerprintFindSensorIntent(@NonNull Context context,
@NonNull Intent activityIntent) { @NonNull Intent activityIntent) {
final boolean isSuw = WizardManagerHelper.isAnySetupWizard(activityIntent); final boolean isSuw = WizardManagerHelper.isAnySetupWizard(activityIntent);
FingerprintEnrollActivityClassProvider clsProvider = FeatureFactory
.getFeatureFactory().getFingerprintFeatureProvider()
.getEnrollActivityClassProvider(context);
final Intent intent = new Intent(context, isSuw final Intent intent = new Intent(context, isSuw
? SetupFingerprintEnrollFindSensor.class : FingerprintEnrollFindSensor.class); ? clsProvider.getSetupSkipIntro() : clsProvider.getSkipIntro());
intent.putExtra(EXTRA_SKIP_INTRO, true);
if (isSuw) { if (isSuw) {
SetupWizardUtils.copySetupExtras(activityIntent, intent); SetupWizardUtils.copySetupExtras(activityIntent, intent);
} }

4
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollActivityClassProvider.kt
View File

@@ -28,6 +28,10 @@ open class FingerprintEnrollActivityClassProvider {
get() = FingerprintEnrollIntroductionInternal::class.java get() = FingerprintEnrollIntroductionInternal::class.java
open val addAnother: Class<out Activity> open val addAnother: Class<out Activity>
get() = FingerprintEnrollEnrolling::class.java 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 { companion object {
@JvmStatic @JvmStatic