Merge "Add persistent MTE toggle to development options."

res/xml/development_memtag_page.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:title="@string/development_memtag_page_title">
+
+    <com.android.settingslib.widget.TopIntroPreference
+        android:title="@string/development_memtag_intro"
+        settings:searchable="false"/>
+
+    <com.android.settingslib.RestrictedSwitchPreference
+        android:key="development_memtag"
+        android:title="@string/development_memtag_toggle"
+        settings:controller="com.android.settings.development.DevelopmentMemtagPreferenceController" />
+
+    <Preference
+        android:key="reboot_with_mte"
+        android:title="@string/reboot_with_mte_title"
+        settings:controller="com.android.settings.development.RebootWithMtePreferenceController" />
+
+    <com.android.settingslib.widget.FooterPreference
+        android:title="@string/development_memtag_footer"
+        android:key="memtag_footer"
+        settings:searchable="false"
+        settings:controller="com.android.settings.development.DevelopmentMemtagFooterPreferenceController" />
+</PreferenceScreen>

res/xml/development_settings.xml

@@ -45,8 +45,9 @@
             android:title="@string/capture_system_heap_dump_title" />
 
         <Preference
-            android:key="reboot_with_mte"
-            android:title="@string/reboot_with_mte_title" />
+            android:key="development_memtag_page"
+            android:title="@string/development_memtag_page_title"
+            android:fragment="com.android.settings.development.DevelopmentMemtagPage" />
 
         <Preference
             android:key="local_backup_password"