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

Merge "Opt out of predictive back for biometrics" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-06-24 18:26:23 +00:00
committed by Android (Google) Code Review
parent cdb50d66e5 40ec147d2b
commit add6f2d24f
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
AndroidManifest.xml
View File

@@ -2891,17 +2891,20 @@
<!-- Note this must not be exported since it returns the password in the intent --> <!-- Note this must not be exported since it returns the password in the intent -->
<activity android:name=".password.ConfirmLockPattern$InternalActivity" <activity android:name=".password.ConfirmLockPattern$InternalActivity"
android:exported="false" android:exported="false"
android:enableOnBackInvokedCallback="false"
android:theme="@style/GlifTheme.Light"/> android:theme="@style/GlifTheme.Light"/>
<!-- Note this must not be exported since it returns the password in the intent --> <!-- Note this must not be exported since it returns the password in the intent -->
<activity android:name=".password.ConfirmLockPassword$InternalActivity" <activity android:name=".password.ConfirmLockPassword$InternalActivity"
android:exported="false" android:exported="false"
android:windowSoftInputMode="adjustResize" android:windowSoftInputMode="adjustResize"
android:enableOnBackInvokedCallback="false"
android:theme="@style/GlifTheme.Light"/> android:theme="@style/GlifTheme.Light"/>
<activity android:name=".password.SetupChooseLockGeneric" <activity android:name=".password.SetupChooseLockGeneric"
android:theme="@style/GlifTheme.Light" android:theme="@style/GlifTheme.Light"
android:exported="true" android:exported="true"
android:enableOnBackInvokedCallback="false"
android:label="@string/lock_settings_picker_title"> android:label="@string/lock_settings_picker_title">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="com.android.settings.SETUP_LOCK_SCREEN" /> <action android:name="com.android.settings.SETUP_LOCK_SCREEN" />
@@ -2911,16 +2914,19 @@
<activity android:name=".password.SetupChooseLockGeneric$InternalActivity" <activity android:name=".password.SetupChooseLockGeneric$InternalActivity"
android:exported="false" android:exported="false"
android:enableOnBackInvokedCallback="false"
android:excludeFromRecents="true" /> android:excludeFromRecents="true" />
<activity android:name=".password.ChooseLockGeneric" <activity android:name=".password.ChooseLockGeneric"
android:label="@string/lockpassword_choose_lock_generic_header" android:label="@string/lockpassword_choose_lock_generic_header"
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:enableOnBackInvokedCallback="false"
android:exported="false" /> android:exported="false" />
<activity android:name=".password.SetNewPasswordActivity" <activity android:name=".password.SetNewPasswordActivity"
android:theme="@android:style/Theme.NoDisplay" android:theme="@android:style/Theme.NoDisplay"
android:exported="true" android:exported="true"
android:enableOnBackInvokedCallback="false"
android:excludeFromRecents="true" > android:excludeFromRecents="true" >
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="android.app.action.SET_NEW_PASSWORD" /> <action android:name="android.app.action.SET_NEW_PASSWORD" />
@@ -2966,24 +2972,29 @@
<activity android:name=".password.ChooseLockGeneric$InternalActivity" <activity android:name=".password.ChooseLockGeneric$InternalActivity"
android:exported="false" android:exported="false"
android:label="@string/lockpassword_choose_lock_generic_header" android:label="@string/lockpassword_choose_lock_generic_header"
android:enableOnBackInvokedCallback="false"
android:excludeFromRecents="true" /> android:excludeFromRecents="true" />
<activity android:name=".password.SetupChooseLockPattern" <activity android:name=".password.SetupChooseLockPattern"
android:exported="false" android:exported="false"
android:enableOnBackInvokedCallback="false"
android:theme="@style/GlifTheme.Light" /> android:theme="@style/GlifTheme.Light" />
<activity android:name=".password.ChooseLockPattern" <activity android:name=".password.ChooseLockPattern"
android:exported="false" android:exported="false"
android:enableOnBackInvokedCallback="false"
android:theme="@style/GlifTheme.Light" /> android:theme="@style/GlifTheme.Light" />
<activity android:name=".password.SetupChooseLockPassword" <activity android:name=".password.SetupChooseLockPassword"
android:exported="false" android:exported="false"
android:theme="@style/GlifTheme.Light" android:theme="@style/GlifTheme.Light"
android:enableOnBackInvokedCallback="false"
android:windowSoftInputMode="stateVisible|adjustResize" /> android:windowSoftInputMode="stateVisible|adjustResize" />
<activity android:name=".password.ChooseLockPassword" <activity android:name=".password.ChooseLockPassword"
android:exported="false" android:exported="false"
android:theme="@style/GlifTheme.Light" android:theme="@style/GlifTheme.Light"
android:enableOnBackInvokedCallback="false"
android:windowSoftInputMode="stateVisible|adjustResize"/> android:windowSoftInputMode="stateVisible|adjustResize"/>
<activity <activity