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

Commit edb0ff11 authored by Jason Chang's avatar Jason Chang Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Iaa927a8b3f6df29d634bfb6baacdb96aeb415899
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f6c75119 d245c110

AndroidManifest.xml

+5 −0
Original line number Diff line number Diff line
@@ -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"