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

Commit 829b6cdb authored by Shawn Lin's avatar Shawn Lin Committed by Android (Google) Code Review
Browse files

Merge "Opt-out predictive back gesture for biometric face settings pages" into main

parents 23513bf7 b7d19000

AndroidManifest.xml

+4 −0
Original line number Diff line number Diff line
@@ -740,6 +740,7 @@ 
        <activity android:name="Settings$FaceSettingsActivity"

            android:label="@string/security_settings_face_preference_title"

            android:exported="true"

            android:enableOnBackInvokedCallback="false"

            android:theme="@style/Theme.Settings.NoActionBar"

            android:icon="@drawable/ic_face_header">

            <intent-filter>
@@ -755,6 +756,7 @@ 
        <activity android:name="Settings$FaceSettingsInternalActivity"

                  android:label="@string/security_settings_face_preference_title"

                  android:exported="false"

                  android:enableOnBackInvokedCallback="false"

                  android:theme="@style/Theme.Settings.NoActionBar"

                  android:icon="@drawable/ic_face_header"

                  android:taskAffinity="com.android.settings.root">
@@ -767,6 +769,7 @@ 
        <activity android:name="Settings$FingerprintSettingsActivity"

                  android:label="@string/security_settings_fingerprint_preference_title"

                  android:exported="true"

                  android:enableOnBackInvokedCallback="false"

                  android:icon="@drawable/ic_fingerprint_header">

            <intent-filter>

                <action android:name="android.settings.FINGERPRINT_SETTINGS" />
@@ -781,6 +784,7 @@ 
        <activity android:name="Settings$CombinedBiometricSettingsActivity"

                  android:label="@string/security_settings_biometric_preference_title"

                  android:exported="false"

                  android:enableOnBackInvokedCallback="false"

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

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.biometrics.combination.CombinedBiometricSettings" />