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

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

Merge "Fix FP enroll page content overlapped by buttons" into main

parents d12a3646 b9049f75

AndroidManifest.xml

+6 −2
Original line number Original line Diff line number Diff line
@@ -2799,7 +2799,9 @@ 
        <activity android:name=".biometrics.fingerprint.FingerprintSettings"

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

                  android:exported="false"

                  android:exported="false"

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

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

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

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

            android:exported="false"

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

        <activity android:name=".biometrics.fingerprint.FingerprintEnrollEnrolling" 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.FingerprintEnrollFinish" android:exported="false"/>

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

        <activity android:name=".biometrics.fingerprint.FingerprintEnrollParentalConsent" android:exported="false"/>
@@ -2832,7 +2834,9 @@ 
                  android:theme="@style/GlifTheme.Light"

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

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

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





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

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

            android:exported="false"

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

        <activity android:name=".biometrics.fingerprint.SetupFingerprintEnrollEnrolling" 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.SetupFingerprintEnrollFinish" android:exported="false"/>

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

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