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

Commit 61984ba4 authored by Bill Lin's avatar Bill Lin Committed by Android (Google) Code Review
Browse files

Merge "Revert "Apply "@style/GlifTheme.Light" for Fingerprint enroll activities"" into main

parents e3a16997 fce30a15

AndroidManifest.xml

+7 −21
Original line number Diff line number Diff line
@@ -2737,18 +2737,10 @@ 
        <activity android:name=".biometrics.fingerprint.FingerprintSettings"

                  android:exported="false"

                  android:taskAffinity="com.android.settings.root" />

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

                  android:exported="false"

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

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

                  android:exported="false"

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

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

                  android:exported="false"

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

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

                  android:exported="false"

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

        <activity android:name=".biometrics.fingerprint.FingerprintEnrollFindSensor" android:exported="false"/>

        <activity android:name=".biometrics.fingerprint.FingerprintEnrollEnrolling" android:exported="false"/>

        <activity android:name=".biometrics.fingerprint.FingerprintEnrollFinish" android:exported="false"/>

        <activity android:name=".biometrics.fingerprint.FingerprintEnrollParentalConsent" android:exported="false"/>

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

            android:exported="true"

            android:theme="@style/GlifTheme.Light">
@@ -2778,15 +2770,9 @@ 
                  android:theme="@style/GlifTheme.Light"

                  android:taskAffinity="com.android.settings.root" />



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

                  android:exported="false"

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

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

                  android:exported="false"

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

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

                  android:exported="false"

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

        <activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollFindSensor" android:exported="false"/>

        <activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollEnrolling" android:exported="false"/>

        <activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollFinish" android:exported="false"/>

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

            android:exported="true"

            android:permission="android.permission.MANAGE_FINGERPRINT"