PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Shawn Lin
2024-08-28 08:54:46 +00:00
committed by Android (Google) Code Review
parent 23513bf7fe b7d190008f
commit 829b6cdbb1
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@@ -740,6 +740,7 @@
<activity android:name="Settings$FaceSettingsActivity" <activity android:name="Settings$FaceSettingsActivity"
android:label="@string/security_settings_face_preference_title" android:label="@string/security_settings_face_preference_title"
android:exported="true" android:exported="true"
android:enableOnBackInvokedCallback="false"
android:theme="@style/Theme.Settings.NoActionBar" android:theme="@style/Theme.Settings.NoActionBar"
android:icon="@drawable/ic_face_header"> android:icon="@drawable/ic_face_header">
<intent-filter> <intent-filter>
@@ -755,6 +756,7 @@
<activity android:name="Settings$FaceSettingsInternalActivity" <activity android:name="Settings$FaceSettingsInternalActivity"
android:label="@string/security_settings_face_preference_title" android:label="@string/security_settings_face_preference_title"
android:exported="false" android:exported="false"
android:enableOnBackInvokedCallback="false"
android:theme="@style/Theme.Settings.NoActionBar" android:theme="@style/Theme.Settings.NoActionBar"
android:icon="@drawable/ic_face_header" android:icon="@drawable/ic_face_header"
android:taskAffinity="com.android.settings.root"> android:taskAffinity="com.android.settings.root">
@@ -767,6 +769,7 @@
<activity android:name="Settings$FingerprintSettingsActivity" <activity android:name="Settings$FingerprintSettingsActivity"
android:label="@string/security_settings_fingerprint_preference_title" android:label="@string/security_settings_fingerprint_preference_title"
android:exported="true" android:exported="true"
android:enableOnBackInvokedCallback="false"
android:icon="@drawable/ic_fingerprint_header"> android:icon="@drawable/ic_fingerprint_header">
<intent-filter> <intent-filter>
<action android:name="android.settings.FINGERPRINT_SETTINGS" /> <action android:name="android.settings.FINGERPRINT_SETTINGS" />
@@ -781,6 +784,7 @@
<activity android:name="Settings$CombinedBiometricSettingsActivity" <activity android:name="Settings$CombinedBiometricSettingsActivity"
android:label="@string/security_settings_biometric_preference_title" android:label="@string/security_settings_biometric_preference_title"
android:exported="false" android:exported="false"
android:enableOnBackInvokedCallback="false"
android:taskAffinity="com.android.settings.root"> android:taskAffinity="com.android.settings.root">
<meta-data android:name="com.android.settings.FRAGMENT_CLASS" <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.biometrics.combination.CombinedBiometricSettings" /> android:value="com.android.settings.biometrics.combination.CombinedBiometricSettings" />