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

Merge "Revert "[MTE] Move toggle to dev options""

Browse Source
This commit is contained in:
Florian Mayer
2023-01-27 19:34:54 +00:00
committed by Android (Google) Code Review
parent c54584127b e972d20608
commit 6a091f7598
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/xml/development_settings.xml
View File

@@ -48,14 +48,6 @@
android:key="reboot_with_mte"
android:title="@string/reboot_with_mte_title" />
<com.android.settingslib.RestrictedPreference
android:id="@+id/memtag_page"
android:key="memtag_page"
android:title="@string/memtag_title"
settings:keywords="@string/keywords_memtag"
android:fragment="com.android.settings.security.MemtagPage"
settings:controller="com.android.settings.security.MemtagPagePreferenceController" />
<Preference
android:key="local_backup_password"
android:title="@string/local_backup_password_title"

9
res/xml/security_advanced_settings.xml
View File

@@ -107,6 +107,15 @@
settings:isPreferenceVisible="@bool/config_show_sim_info"
settings:controller="com.android.settings.security.ConfirmSimDeletionPreferenceController" />
<com.android.settingslib.RestrictedPreference
android:order="100"
android:id="@+id/memtag_page"
android:key="memtag_page"
android:title="@string/memtag_title"
settings:keywords="@string/keywords_memtag"
android:fragment="com.android.settings.security.MemtagPage"
settings:controller="com.android.settings.security.MemtagPagePreferenceController" />
<!-- work profile security section -->
<PreferenceCategory
android:order="110"