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

Commit 148774d2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fingerprint Introduction FragmentActivity"

parents 7765c712 b9b8b8a5

AndroidManifest.xml

+5 −0
Original line number Diff line number Diff line
@@ -2403,6 +2403,11 @@ 
            </intent-filter>

        </activity>



        <activity android:name=".biometrics2.ui.view.FingerprintEnrollmentActivity"

            android:exported="true"

            android:permission="android.permission.MANAGE_FINGERPRINT"

            android:theme="@style/GlifTheme.Light"/>



        <activity android:name=".biometrics.fingerprint.FingerprintEnrollIntroductionInternal"

                  android:exported="false"

                  android:theme="@style/GlifTheme.Light"

res/layout/biometric_enrollment_container.xml

0 → 100644
+6 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<androidx.fragment.app.FragmentContainerView

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/fragment_container_view"

    android:layout_width="match_parent"

    android:layout_height="match_parent" />
 
 No newline at end of file

src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import com.android.settings.SubSettings; 
import com.android.settings.biometrics.fingerprint.FingerprintEnrollEnrolling;

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

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

import com.android.settings.biometrics2.ui.view.FingerprintEnrollmentActivity;

import com.android.settings.core.FeatureFlags;

import com.android.settings.homepage.DeepLinkHomepageActivity;

import com.android.settings.homepage.DeepLinkHomepageActivityInternal;
@@ -225,6 +226,7 @@ public class ActivityEmbeddingRulesController { 
                    .buildSearchIntent(mContext, SettingsEnums.SETTINGS_HOMEPAGE);

            addActivityFilter(activityFilters, searchIntent);

        }

        addActivityFilter(activityFilters, FingerprintEnrollmentActivity.class);

        addActivityFilter(activityFilters, FingerprintEnrollIntroduction.class);

        addActivityFilter(activityFilters, FingerprintEnrollIntroductionInternal.class);

        addActivityFilter(activityFilters, FingerprintEnrollEnrolling.class);

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

+26 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.content.IntentSender; 
import android.hardware.biometrics.SensorProperties;

import android.hardware.face.FaceManager;

import android.hardware.face.FaceSensorPropertiesInternal;

import android.os.Bundle;

import android.os.storage.StorageManager;

import android.util.Log;

import android.view.Surface;
@@ -145,6 +146,31 @@ public class BiometricUtils { 
        }

    }



    /**

     * @param context caller's context

     * @param isSuw if it is running in setup wizard flows

     * @param suwExtras setup wizard extras for new intent

     * @return Intent for starting ChooseLock*

     */

    public static Intent getChooseLockIntent(@NonNull Context context,

            boolean isSuw, @NonNull Bundle suwExtras) {

        if (isSuw) {

            // Default to PIN lock in setup wizard

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

            if (StorageManager.isFileEncrypted()) {

                intent.putExtra(

                        LockPatternUtils.PASSWORD_TYPE_KEY,

                        DevicePolicyManager.PASSWORD_QUALITY_NUMERIC);

                intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment

                        .EXTRA_SHOW_OPTIONS_BUTTON, true);

            }

            intent.putExtras(suwExtras);

            return intent;

        } else {

            return new Intent(context, ChooseLockGeneric.class);

        }

    }



    /**

     * @param context caller's context

     * @param activityIntent The intent that started the caller's activity

src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntrodu 
    /**

     * Returns the number of fingerprint enrolled.

     */

    private static final String EXTRA_FINGERPRINT_ENROLLED_COUNT = "fingerprint_enrolled_count";

    public static final String EXTRA_FINGERPRINT_ENROLLED_COUNT = "fingerprint_enrolled_count";



    private static final String KEY_LOCK_SCREEN_PRESENT = "wasLockScreenPresent";