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

This commit is contained in:
Bill Lin
2024-04-10 08:43:59 +00:00
committed by Android (Google) Code Review

View File

@@ -2737,10 +2737,18 @@
<activity android:name=".biometrics.fingerprint.FingerprintSettings"
android:exported="false"
android:taskAffinity="com.android.settings.root" />
<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.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.FingerprintEnrollIntroduction"
android:exported="true"
android:theme="@style/GlifTheme.Light">
@@ -2770,9 +2778,15 @@
android:theme="@style/GlifTheme.Light"
android:taskAffinity="com.android.settings.root" />
<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.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.SetupFingerprintEnrollIntroduction"
android:exported="true"
android:permission="android.permission.MANAGE_FINGERPRINT"