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

Commit ee5ebfa1 authored by Milton Wu's avatar Milton Wu
Browse files

Apply feature flag for biometrics

adb shell setprop sys.fflag.override.settings_biometrics2_enrollment true

Bug: 236072782
Test: Manully enable feature flag and test
Change-Id: Id794ba117d3ae9e0bc76086ee8c1cd95fa607cc1
parent b9b8b8a5
Loading
Loading
Loading
Loading
+9 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.hardware.face.FaceManager;
import android.hardware.face.FaceSensorPropertiesInternal;
import android.os.Bundle;
import android.os.storage.StorageManager;
import android.util.FeatureFlagUtils;
import android.util.Log;
import android.view.Surface;

@@ -41,6 +42,7 @@ 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.SetupFingerprintEnrollIntroduction;
import com.android.settings.biometrics2.ui.view.FingerprintEnrollmentActivity;
import com.android.settings.password.ChooseLockGeneric;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.password.SetupChooseLockGeneric;
@@ -190,7 +192,13 @@ public class BiometricUtils {
     */
    public static Intent getFingerprintIntroIntent(@NonNull Context context,
            @NonNull Intent activityIntent) {
        if (FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SETTINGS_BIOMETRICS2_ENROLLMENT)) {
            final Intent intent = new Intent(context, FingerprintEnrollmentActivity.class);
            if (WizardManagerHelper.isAnySetupWizard(activityIntent)) {
                WizardManagerHelper.copyWizardManagerExtras(activityIntent, intent);
            }
            return intent;
        } else if (WizardManagerHelper.isAnySetupWizard(activityIntent)) {
            Intent intent = new Intent(context, SetupFingerprintEnrollIntroduction.class);
            WizardManagerHelper.copyWizardManagerExtras(activityIntent, intent);
            return intent;
+7 −1
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import android.os.UserManager;
import android.text.InputFilter;
import android.text.Spanned;
import android.text.TextUtils;
import android.util.FeatureFlagUtils;
import android.util.Log;
import android.view.View;
import android.widget.ImeAwareEditText;
@@ -63,6 +64,7 @@ import com.android.settings.SubSettings;
import com.android.settings.Utils;
import com.android.settings.biometrics.BiometricEnrollBase;
import com.android.settings.biometrics.BiometricUtils;
import com.android.settings.biometrics2.ui.view.FingerprintEnrollmentActivity;
import com.android.settings.core.SettingsBaseActivity;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.dashboard.DashboardFragment;
@@ -872,7 +874,11 @@ public class FingerprintSettings extends SubSettings {
        private void addFirstFingerprint() {
            Intent intent = new Intent();
            intent.setClassName(SETTINGS_PACKAGE_NAME,
                    FingerprintEnrollIntroductionInternal.class.getName());
                    FeatureFlagUtils.isEnabled(getActivity(),
                            FeatureFlagUtils.SETTINGS_BIOMETRICS2_ENROLLMENT)
                            ? FingerprintEnrollmentActivity.class.getName()
                            : FingerprintEnrollIntroductionInternal.class.getName()
            );

            intent.putExtra(EXTRA_FROM_SETTINGS_SUMMARY, true);
            intent.putExtra(SettingsBaseActivity.EXTRA_PAGE_TRANSITION_TYPE,