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

Commit c4ceb8c1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move injected tiles under debug section"

parents 7ccd083f b74a23cc
Loading
Loading
Loading
Loading
+207 −186
Original line number Diff line number Diff line
@@ -19,6 +19,10 @@
                  android:key="development_prefs_screen"
                  android:title="@string/development_settings_title">

    <PreferenceCategory
        android:key="debug_misc_category"
        android:order="100">

        <Preference
            android:key="memory"
            android:icon="@drawable/ic_settings_memory"
@@ -107,9 +111,12 @@
            android:key="quick_settings_tiles"
            android:title="@string/quick_settings_developer_tiles"
            android:fragment="com.android.settings.development.qstile.DevelopmentTileConfigFragment" />
    </PreferenceCategory>

    <PreferenceCategory android:key="debug_debugging_category"
            android:title="@string/debug_debugging_category">
    <PreferenceCategory
        android:key="debug_debugging_category"
        android:title="@string/debug_debugging_category"
        android:order="200">

        <SwitchPreference
            android:key="enable_adb"
@@ -189,8 +196,14 @@

    </PreferenceCategory>

    <PreferenceCategory android:key="debug_networking_category"
            android:title="@string/debug_networking_category">
    <PreferenceCategory
        android:key="dashboard_tile_placeholder"
        android:order="300" />

    <PreferenceCategory
        android:key="debug_networking_category"
        android:title="@string/debug_networking_category"
        android:order="400">

        <SwitchPreference
            android:key="wifi_display_certification"
@@ -290,8 +303,10 @@

    </PreferenceCategory>

    <PreferenceCategory android:key="debug_input_category"
            android:title="@string/debug_input_category">
    <PreferenceCategory
        android:key="debug_input_category"
        android:title="@string/debug_input_category"
        android:order="500">

        <SwitchPreference
            android:key="show_touches"
@@ -305,8 +320,10 @@

    </PreferenceCategory>

    <PreferenceCategory android:key="debug_drawing_category"
            android:title="@string/debug_drawing_category">
    <PreferenceCategory
        android:key="debug_drawing_category"
        android:title="@string/debug_drawing_category"
        android:order="600">

        <SwitchPreference
            android:key="show_screen_updates"
@@ -357,8 +374,10 @@

    </PreferenceCategory>

    <PreferenceCategory android:key="debug_hw_drawing_category"
            android:title="@string/debug_hw_drawing_category">
    <PreferenceCategory
        android:key="debug_hw_drawing_category"
        android:title="@string/debug_hw_drawing_category"
        android:order="700">

        <SwitchPreference
            android:key="force_hw_ui"
@@ -412,8 +431,10 @@

    </PreferenceCategory>

    <PreferenceCategory android:key="media_category"
            android:title="@string/media_category">
    <PreferenceCategory
        android:key="media_category"
        android:title="@string/media_category"
        android:order="800">

        <SwitchPreference
            android:key="usb_audio"
@@ -422,8 +443,10 @@

    </PreferenceCategory>

    <PreferenceCategory android:key="debug_monitoring_category"
            android:title="@string/debug_monitoring_category">
    <PreferenceCategory
        android:key="debug_monitoring_category"
        android:title="@string/debug_monitoring_category"
        android:order="900">

        <SwitchPreference
            android:key="strict_mode"
@@ -438,8 +461,10 @@

    </PreferenceCategory>

    <PreferenceCategory android:key="debug_applications_category"
            android:title="@string/debug_applications_category">
    <PreferenceCategory
        android:key="debug_applications_category"
        android:title="@string/debug_applications_category"
        android:order="1000">

        <SwitchPreference
            android:key="immediately_destroy_activities"
@@ -498,8 +523,4 @@
            android:title="@string/reset_shortcut_manager_throttling" />
    </PreferenceCategory>

    <PreferenceCategory
      android:key="dashboard_tile_placeholder"
      android:order="200"/>

</PreferenceScreen>