Merge "Fix face unlock setup page is abnormal" into 24D1-dev am: d245c1108a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26784347

Change-Id: Iaa927a8b3f6df29d634bfb6baacdb96aeb415899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jason Chang
2024-04-03 03:25:00 +00:00
committed by Automerger Merge Worker

View File

@@ -2686,6 +2686,7 @@
<activity android:name=".biometrics.face.FaceEnrollIntroduction"
android:exported="true"
android:theme="@style/GlifV4Theme.DayNight"
android:screenOrientation="nosensor">
<intent-filter>
<action android:name="android.settings.FACE_ENROLL"/>
@@ -2696,18 +2697,22 @@
<activity android:name=".biometrics.face.FaceEnrollIntroductionInternal"
android:exported="false"
android:screenOrientation="nosensor"
android:theme="@style/GlifV4Theme.DayNight"
android:taskAffinity="com.android.settings.root" />
<activity android:name=".biometrics.face.FaceEnrollEducation"
android:exported="false"
android:theme="@style/GlifV4Theme.DayNight"
android:screenOrientation="nosensor"/>
<activity android:name=".biometrics.face.FaceEnrollEnrolling"
android:exported="false"
android:theme="@style/GlifV4Theme.DayNight"
android:screenOrientation="portrait"/>
<activity android:name=".biometrics.face.FaceEnrollFinish"
android:exported="false"
android:theme="@style/GlifV4Theme.DayNight"
android:screenOrientation="portrait"/>
<activity android:name=".biometrics.BiometricHandoffActivity"