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

Commit 6a091f75 authored by Florian Mayer's avatar Florian Mayer Committed by Android (Google) Code Review
Browse files

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

parents c5458412 e972d206

res/xml/development_settings.xml

+0 −8
Original line number Diff line number Diff line
@@ -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"

res/xml/security_advanced_settings.xml

+9 −0
Original line number Diff line number Diff line
@@ -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"