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

Commit add6f2d2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

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

parents cdb50d66 40ec147d

AndroidManifest.xml

+11 −0
Original line number Diff line number Diff line
@@ -2891,17 +2891,20 @@ 
        <!-- Note this must not be exported since it returns the password in the intent -->

        <activity android:name=".password.ConfirmLockPattern$InternalActivity"

            android:exported="false"

            android:enableOnBackInvokedCallback="false"

            android:theme="@style/GlifTheme.Light"/>



        <!-- Note this must not be exported since it returns the password in the intent -->

        <activity android:name=".password.ConfirmLockPassword$InternalActivity"

            android:exported="false"

            android:windowSoftInputMode="adjustResize"

            android:enableOnBackInvokedCallback="false"

            android:theme="@style/GlifTheme.Light"/>



        <activity android:name=".password.SetupChooseLockGeneric"

            android:theme="@style/GlifTheme.Light"

            android:exported="true"

            android:enableOnBackInvokedCallback="false"

            android:label="@string/lock_settings_picker_title">

            <intent-filter android:priority="1">

                <action android:name="com.android.settings.SETUP_LOCK_SCREEN" />
@@ -2911,16 +2914,19 @@ 


        <activity android:name=".password.SetupChooseLockGeneric$InternalActivity"

            android:exported="false"

            android:enableOnBackInvokedCallback="false"

            android:excludeFromRecents="true" />



        <activity android:name=".password.ChooseLockGeneric"

            android:label="@string/lockpassword_choose_lock_generic_header"

            android:excludeFromRecents="true"

            android:enableOnBackInvokedCallback="false"

            android:exported="false" />



        <activity android:name=".password.SetNewPasswordActivity"

            android:theme="@android:style/Theme.NoDisplay"

            android:exported="true"

            android:enableOnBackInvokedCallback="false"

            android:excludeFromRecents="true" >

            <intent-filter android:priority="1">

                <action android:name="android.app.action.SET_NEW_PASSWORD" />
@@ -2966,24 +2972,29 @@ 
        <activity android:name=".password.ChooseLockGeneric$InternalActivity"

            android:exported="false"

            android:label="@string/lockpassword_choose_lock_generic_header"

            android:enableOnBackInvokedCallback="false"

            android:excludeFromRecents="true" />



        <activity android:name=".password.SetupChooseLockPattern"

            android:exported="false"

            android:enableOnBackInvokedCallback="false"

            android:theme="@style/GlifTheme.Light" />



        <activity android:name=".password.ChooseLockPattern"

            android:exported="false"

            android:enableOnBackInvokedCallback="false"

            android:theme="@style/GlifTheme.Light" />



        <activity android:name=".password.SetupChooseLockPassword"

            android:exported="false"

            android:theme="@style/GlifTheme.Light"

            android:enableOnBackInvokedCallback="false"

            android:windowSoftInputMode="stateVisible|adjustResize" />



        <activity android:name=".password.ChooseLockPassword"

            android:exported="false"

            android:theme="@style/GlifTheme.Light"

            android:enableOnBackInvokedCallback="false"

            android:windowSoftInputMode="stateVisible|adjustResize"/>



        <activity