Skip to content

Commit e6ac6fa

Browse files
muhomorrthestinger
authored andcommitted
disable predictive back gesture in PIN/password input activities
Predictive back UI reveals the previous activity and makes it partially interactable. The previous activity might be protected by the top PIN/password input activity, e.g. the fingerprint settings activity, duress password activity etc. The list of activities was copied from an Android 15 Beta 4 build.
1 parent 8981ad6 commit e6ac6fa

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

AndroidManifest.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2641,9 +2641,11 @@
26412641
</activity>
26422642

26432643
<activity android:name=".password.ConfirmLockPattern"
2644+
android:enableOnBackInvokedCallback="false"
26442645
android:theme="@style/GlifTheme.Light"/>
26452646

26462647
<activity android:name=".password.ConfirmLockPassword"
2648+
android:enableOnBackInvokedCallback="false"
26472649
android:windowSoftInputMode="stateHidden|adjustResize"
26482650
android:theme="@style/GlifTheme.Light"/>
26492651

@@ -2811,11 +2813,13 @@
28112813

28122814
<!-- Note this must not be exported since it returns the password in the intent -->
28132815
<activity android:name=".password.ConfirmLockPassword$InternalActivity"
2816+
android:enableOnBackInvokedCallback="false"
28142817
android:exported="false"
28152818
android:windowSoftInputMode="adjustResize"
28162819
android:theme="@style/GlifTheme.Light"/>
28172820

28182821
<activity android:name=".password.SetupChooseLockGeneric"
2822+
android:enableOnBackInvokedCallback="false"
28192823
android:theme="@style/GlifTheme.Light"
28202824
android:exported="true"
28212825
android:label="@string/lock_settings_picker_title">
@@ -2826,15 +2830,18 @@
28262830
</activity>
28272831

28282832
<activity android:name=".password.SetupChooseLockGeneric$InternalActivity"
2833+
android:enableOnBackInvokedCallback="false"
28292834
android:exported="false"
28302835
android:excludeFromRecents="true" />
28312836

28322837
<activity android:name=".password.ChooseLockGeneric"
2838+
android:enableOnBackInvokedCallback="false"
28332839
android:label="@string/lockpassword_choose_lock_generic_header"
28342840
android:excludeFromRecents="true"
28352841
android:exported="false" />
28362842

28372843
<activity android:name=".password.SetNewPasswordActivity"
2844+
android:enableOnBackInvokedCallback="false"
28382845
android:theme="@android:style/Theme.NoDisplay"
28392846
android:exported="true"
28402847
android:excludeFromRecents="true" >
@@ -2890,24 +2897,29 @@
28902897
</activity>
28912898

28922899
<activity android:name=".password.ChooseLockGeneric$InternalActivity"
2900+
android:enableOnBackInvokedCallback="false"
28932901
android:exported="false"
28942902
android:label="@string/lockpassword_choose_lock_generic_header"
28952903
android:excludeFromRecents="true" />
28962904

28972905
<activity android:name=".password.SetupChooseLockPattern"
2906+
android:enableOnBackInvokedCallback="false"
28982907
android:exported="false"
28992908
android:theme="@style/GlifTheme.Light" />
29002909

29012910
<activity android:name=".password.ChooseLockPattern"
2911+
android:enableOnBackInvokedCallback="false"
29022912
android:exported="false"
29032913
android:theme="@style/GlifTheme.Light" />
29042914

29052915
<activity android:name=".password.SetupChooseLockPassword"
2916+
android:enableOnBackInvokedCallback="false"
29062917
android:exported="false"
29072918
android:theme="@style/GlifTheme.Light"
29082919
android:windowSoftInputMode="stateVisible|adjustResize" />
29092920

29102921
<activity android:name=".password.ChooseLockPassword"
2922+
android:enableOnBackInvokedCallback="false"
29112923
android:exported="false"
29122924
android:theme="@style/GlifTheme.Light"
29132925
android:windowSoftInputMode="stateVisible|adjustResize"/>

0 commit comments

Comments
 (0)