From c70ffd6b3b9a9f03cb545119d03642a720a324df Mon Sep 17 00:00:00 2001
From: Florian Mayer <fmayer@google.com>
Date: Wed, 18 Jan 2023 12:24:11 -0800
Subject: [PATCH] [MTE] Move toggle to dev options

Change-Id: I136d3399bd11d782d21a29873a10a55049aff8b6
---
 res/xml/development_settings.xml       | 8 ++++++++
 res/xml/security_advanced_settings.xml | 9 ---------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 2bc1b87a50c..4a508ef20b3 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -48,6 +48,14 @@
             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"
diff --git a/res/xml/security_advanced_settings.xml b/res/xml/security_advanced_settings.xml
index 4db078e97ba..f57ab9a1255 100644
--- a/res/xml/security_advanced_settings.xml
+++ b/res/xml/security_advanced_settings.xml
@@ -107,15 +107,6 @@
         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"