Move injected tiles under debug section
Bug: 64762598
Test: atest UniquePreferenceTest
Change-Id: I6d6661b84c2a94bc66e1afe04c01fee39282506a
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 04644f5..42e5c54 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -15,109 +15,116 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res-auto"
- android:key="development_prefs_screen"
- android:title="@string/development_settings_title">
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:key="development_prefs_screen"
+ android:title="@string/development_settings_title">
- <Preference
- android:key="memory"
- android:icon="@drawable/ic_settings_memory"
- android:title="@string/memory_settings_title"
- android:summary="@string/summary_placeholder"
- android:fragment="com.android.settings.applications.ProcessStatsSummary" />
+ <PreferenceCategory
+ android:key="debug_misc_category"
+ android:order="100">
- <com.android.settings.BugreportPreference
+ <Preference
+ android:key="memory"
+ android:icon="@drawable/ic_settings_memory"
+ android:title="@string/memory_settings_title"
+ android:summary="@string/summary_placeholder"
+ android:fragment="com.android.settings.applications.ProcessStatsSummary" />
+
+ <com.android.settings.BugreportPreference
android:key="bugreport"
android:title="@*android:string/bugreport_title"
android:dialogTitle="@*android:string/bugreport_title" />
- <Preference
+ <Preference
android:key="local_backup_password"
android:title="@string/local_backup_password_title"
android:summary="@string/local_backup_password_summary_none"
- android:persistent="false" >
- <intent
+ android:persistent="false">
+ <intent
android:action="android.settings.privacy.SET_FULL_BACKUP_PASSWORD"
android:targetPackage="com.android.settings"
android:targetClass="com.android.settings.SetFullBackupPassword" />
- </Preference>
+ </Preference>
- <com.android.settingslib.RestrictedSwitchPreference
- android:key="keep_screen_on"
- android:title="@string/keep_screen_on"
- android:summary="@string/keep_screen_on_summary"
- settings:useAdditionalSummary="true" />
+ <com.android.settingslib.RestrictedSwitchPreference
+ android:key="keep_screen_on"
+ android:title="@string/keep_screen_on"
+ android:summary="@string/keep_screen_on_summary"
+ settings:useAdditionalSummary="true" />
- <ListPreference
- android:key="hdcp_checking"
- android:title="@string/hdcp_checking_title"
- android:dialogTitle="@string/hdcp_checking_dialog_title"
- android:entries="@array/hdcp_checking_titles"
- android:entryValues="@array/hdcp_checking_values" />
+ <ListPreference
+ android:key="hdcp_checking"
+ android:title="@string/hdcp_checking_title"
+ android:dialogTitle="@string/hdcp_checking_dialog_title"
+ android:entries="@array/hdcp_checking_titles"
+ android:entryValues="@array/hdcp_checking_values" />
- <SwitchPreference
- android:key="bt_hci_snoop_log"
- android:title="@string/bt_hci_snoop_log"
- android:summary="@string/bt_hci_snoop_log_summary"/>
+ <SwitchPreference
+ android:key="bt_hci_snoop_log"
+ android:title="@string/bt_hci_snoop_log"
+ android:summary="@string/bt_hci_snoop_log_summary" />
- <com.android.settingslib.RestrictedSwitchPreference
- android:key="oem_unlock_enable"
- android:title="@string/oem_unlock_enable"
- android:summary="@string/oem_unlock_enable_summary"
- settings:useAdditionalSummary="true"/>
+ <com.android.settingslib.RestrictedSwitchPreference
+ android:key="oem_unlock_enable"
+ android:title="@string/oem_unlock_enable"
+ android:summary="@string/oem_unlock_enable_summary"
+ settings:useAdditionalSummary="true" />
- <Preference
- android:key="running_apps"
- android:title="@string/runningservices_settings_title"
- android:summary="@string/runningservices_settings_summary"
- android:fragment="com.android.settings.applications.RunningServices" />
+ <Preference
+ android:key="running_apps"
+ android:title="@string/runningservices_settings_title"
+ android:summary="@string/runningservices_settings_summary"
+ android:fragment="com.android.settings.applications.RunningServices" />
- <Preference
- android:key="convert_to_file_encryption"
- android:title="@string/convert_to_file_encryption"
- android:summary="@string/convert_to_file_encryption_enabled"
- android:fragment="com.android.settings.applications.ConvertToFbe" />
+ <Preference
+ android:key="convert_to_file_encryption"
+ android:title="@string/convert_to_file_encryption"
+ android:summary="@string/convert_to_file_encryption_enabled"
+ android:fragment="com.android.settings.applications.ConvertToFbe" />
- <com.android.settings.development.ColorModePreference
- android:key="picture_color_mode"
- android:title="@string/picture_color_mode"
- android:summary="@string/picture_color_mode_desc" />
+ <com.android.settings.development.ColorModePreference
+ android:key="picture_color_mode"
+ android:title="@string/picture_color_mode"
+ android:summary="@string/picture_color_mode_desc" />
- <Preference android:key="select_webview_provider"
- android:title="@string/select_webview_provider_title"
- android:dialogTitle="@string/select_webview_provider_dialog_title"
- android:fragment="com.android.settings.webview.WebViewAppPicker" />
+ <Preference android:key="select_webview_provider"
+ android:title="@string/select_webview_provider_title"
+ android:dialogTitle="@string/select_webview_provider_dialog_title"
+ android:fragment="com.android.settings.webview.WebViewAppPicker" />
- <SwitchPreference
- android:key="color_temperature"
- android:title="@string/color_temperature"
- android:summary="@string/color_temperature_desc" />
+ <SwitchPreference
+ android:key="color_temperature"
+ android:title="@string/color_temperature"
+ android:summary="@string/color_temperature_desc" />
- <SwitchPreference
- android:key="ota_disable_automatic_update"
- android:title="@string/ota_disable_automatic_update" />
+ <SwitchPreference
+ android:key="ota_disable_automatic_update"
+ android:title="@string/ota_disable_automatic_update" />
- <Preference
- android:key="demo_mode"
- android:title="@string/demo_mode">
- <intent android:action="com.android.settings.action.DEMO_MODE" />
- </Preference>
+ <Preference
+ android:key="demo_mode"
+ android:title="@string/demo_mode">
+ <intent android:action="com.android.settings.action.DEMO_MODE" />
+ </Preference>
- <Preference
- android:key="quick_settings_tiles"
- android:title="@string/quick_settings_developer_tiles"
- android:fragment="com.android.settings.development.qstile.DevelopmentTileConfigFragment" />
+ <Preference
+ 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"
android:title="@string/enable_adb"
- android:summary="@string/enable_adb_summary"/>
+ android:summary="@string/enable_adb_summary" />
<Preference android:key="clear_adb_keys"
- android:title="@string/clear_adb_keys" />
+ android:title="@string/clear_adb_keys" />
<SwitchPreference
android:key="enable_terminal"
@@ -127,32 +134,32 @@
<SwitchPreference
android:key="bugreport_in_power"
android:title="@string/bugreport_in_power"
- android:summary="@string/bugreport_in_power_summary"/>
+ android:summary="@string/bugreport_in_power_summary" />
<Preference android:key="mock_location_app"
- android:title="@string/mock_location_app" />
+ android:title="@string/mock_location_app" />
<SwitchPreference
android:key="enable_gnss_raw_meas_full_tracking"
android:title="@string/enable_gnss_raw_meas_full_tracking"
- android:summary="@string/enable_gnss_raw_meas_full_tracking_summary"/>
+ android:summary="@string/enable_gnss_raw_meas_full_tracking_summary" />
<SwitchPreference
- android:key="debug_view_attributes"
- android:title="@string/debug_view_attributes" />
+ android:key="debug_view_attributes"
+ android:title="@string/debug_view_attributes" />
<Preference android:key="debug_app"
- android:title="@string/debug_app" />
+ android:title="@string/debug_app" />
<SwitchPreference
android:key="wait_for_debugger"
android:title="@string/wait_for_debugger"
- android:summary="@string/wait_for_debugger_summary"/>
+ android:summary="@string/wait_for_debugger_summary" />
<com.android.settingslib.RestrictedSwitchPreference
android:key="verify_apps_over_usb"
android:title="@string/verify_apps_over_usb_title"
- android:summary="@string/verify_apps_over_usb_summary"/>
+ android:summary="@string/verify_apps_over_usb_summary" />
<ListPreference
android:key="select_logd_size"
@@ -171,7 +178,7 @@
<SwitchPreference
android:key="connectivity_monitor_switch"
android:title="@string/connectivity_monitor_switch"
- android:summary="@string/connectivity_monitor_switch_summary"/>
+ android:summary="@string/connectivity_monitor_switch_summary" />
<SwitchPreference
android:key="camera_laser_sensor_switch"
@@ -180,42 +187,48 @@
<Preference
android:key="feature_flags_dashboard"
android:title="@string/feature_flags_dashboard_title"
- android:fragment="com.android.settings.development.featureflags.FeatureFlagsDashboard"/>
+ android:fragment="com.android.settings.development.featureflags.FeatureFlagsDashboard" />
<SwitchPreference
android:key="enable_gpu_debug_layers"
android:title="@string/enable_gpu_debug_layers"
- android:summary="@string/enable_gpu_debug_layers_summary"/>
+ android:summary="@string/enable_gpu_debug_layers_summary" />
</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"
android:title="@string/wifi_display_certification"
- android:summary="@string/wifi_display_certification_summary"/>
+ android:summary="@string/wifi_display_certification_summary" />
<SwitchPreference
android:key="wifi_verbose_logging"
android:title="@string/wifi_verbose_logging"
- android:summary="@string/wifi_verbose_logging_summary"/>
+ android:summary="@string/wifi_verbose_logging_summary" />
<SwitchPreference
android:key="wifi_connected_mac_randomization"
android:title="@string/wifi_connected_mac_randomization"
- android:summary="@string/wifi_connected_mac_randomization_summary"/>
+ android:summary="@string/wifi_connected_mac_randomization_summary" />
<SwitchPreference
android:key="mobile_data_always_on"
android:title="@string/mobile_data_always_on"
- android:summary="@string/mobile_data_always_on_summary"/>
+ android:summary="@string/mobile_data_always_on_summary" />
<SwitchPreference
android:key="tethering_hardware_offload"
android:title="@string/tethering_hardware_offload"
- android:summary="@string/tethering_hardware_offload_summary"/>
+ android:summary="@string/tethering_hardware_offload_summary" />
<ListPreference
android:key="select_usb_configuration"
@@ -227,17 +240,17 @@
<SwitchPreference
android:key="bluetooth_show_devices_without_names"
android:title="@string/bluetooth_show_devices_without_names"
- android:summary="@string/bluetooth_show_devices_without_names_summary"/>
+ android:summary="@string/bluetooth_show_devices_without_names_summary" />
<SwitchPreference
android:key="bluetooth_disable_absolute_volume"
android:title="@string/bluetooth_disable_absolute_volume"
- android:summary="@string/bluetooth_disable_absolute_volume_summary"/>
+ android:summary="@string/bluetooth_disable_absolute_volume_summary" />
<SwitchPreference
android:key="bluetooth_disable_inband_ringing"
android:title="@string/bluetooth_disable_inband_ringing"
- android:summary="@string/bluetooth_disable_inband_ringing_summary"/>
+ android:summary="@string/bluetooth_disable_inband_ringing_summary" />
<ListPreference
android:key="bluetooth_select_avrcp_version"
@@ -282,46 +295,50 @@
android:entryValues="@array/bluetooth_a2dp_codec_ldac_playback_quality_values" />
<ListPreference
- android:key="bluetooth_max_connected_audio_devices"
- android:title="@string/bluetooth_max_connected_audio_devices_string"
- android:dialogTitle="@string/bluetooth_max_connected_audio_devices_dialog_title"
- android:entries="@array/bluetooth_max_connected_audio_devices"
- android:entryValues="@array/bluetooth_max_connected_audio_devices_values" />
+ android:key="bluetooth_max_connected_audio_devices"
+ android:title="@string/bluetooth_max_connected_audio_devices_string"
+ android:dialogTitle="@string/bluetooth_max_connected_audio_devices_dialog_title"
+ android:entries="@array/bluetooth_max_connected_audio_devices"
+ android:entryValues="@array/bluetooth_max_connected_audio_devices_values" />
</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"
android:title="@string/show_touches"
- android:summary="@string/show_touches_summary"/>
+ android:summary="@string/show_touches_summary" />
<SwitchPreference
android:key="pointer_location"
android:title="@string/pointer_location"
- android:summary="@string/pointer_location_summary"/>
+ android:summary="@string/pointer_location_summary" />
</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"
android:title="@string/show_screen_updates"
- android:summary="@string/show_screen_updates_summary"/>
+ android:summary="@string/show_screen_updates_summary" />
<SwitchPreference
android:key="debug_layout"
android:title="@string/debug_layout"
- android:summary="@string/debug_layout_summary"/>
+ android:summary="@string/debug_layout_summary" />
<SwitchPreference
android:key="force_rtl_layout_all_locales"
android:title="@string/force_rtl_layout_all_locales"
- android:summary="@string/force_rtl_layout_all_locales_summary"/>
+ android:summary="@string/force_rtl_layout_all_locales_summary" />
<ListPreference
android:key="window_animation_scale"
@@ -357,78 +374,84 @@
</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"
- android:title="@string/force_hw_ui"
- android:summary="@string/force_hw_ui_summary"/>
+ android:key="force_hw_ui"
+ android:title="@string/force_hw_ui"
+ android:summary="@string/force_hw_ui_summary" />
<SwitchPreference
- android:key="show_hw_screen_updates"
- android:title="@string/show_hw_screen_updates"
- android:summary="@string/show_hw_screen_updates_summary"/>
+ android:key="show_hw_screen_updates"
+ android:title="@string/show_hw_screen_updates"
+ android:summary="@string/show_hw_screen_updates_summary" />
<SwitchPreference
- android:key="show_hw_layers_updates"
- android:title="@string/show_hw_layers_updates"
- android:summary="@string/show_hw_layers_updates_summary"/>
+ android:key="show_hw_layers_updates"
+ android:title="@string/show_hw_layers_updates"
+ android:summary="@string/show_hw_layers_updates_summary" />
<ListPreference
- android:key="debug_hw_overdraw"
- android:title="@string/debug_hw_overdraw"
- android:entries="@array/debug_hw_overdraw_entries"
- android:entryValues="@array/debug_hw_overdraw_values" />
+ android:key="debug_hw_overdraw"
+ android:title="@string/debug_hw_overdraw"
+ android:entries="@array/debug_hw_overdraw_entries"
+ android:entryValues="@array/debug_hw_overdraw_values" />
<ListPreference
- android:key="show_non_rect_clip"
- android:title="@string/show_non_rect_clip"
- android:entries="@array/show_non_rect_clip_entries"
- android:entryValues="@array/show_non_rect_clip_values" />
+ android:key="show_non_rect_clip"
+ android:title="@string/show_non_rect_clip"
+ android:entries="@array/show_non_rect_clip_entries"
+ android:entryValues="@array/show_non_rect_clip_values" />
<SwitchPreference
- android:key="force_msaa"
- android:title="@string/force_msaa"
- android:summary="@string/force_msaa_summary"/>
+ android:key="force_msaa"
+ android:title="@string/force_msaa"
+ android:summary="@string/force_msaa_summary" />
<SwitchPreference
- android:key="disable_overlays"
- android:title="@string/disable_overlays"
- android:summary="@string/disable_overlays_summary"/>
+ android:key="disable_overlays"
+ android:title="@string/disable_overlays"
+ android:summary="@string/disable_overlays_summary" />
<ListPreference
- android:entries="@array/simulate_color_space_entries"
- android:entryValues="@array/simulate_color_space_values"
- android:key="simulate_color_space"
- android:summary="%s"
- android:title="@string/simulate_color_space" />
+ android:entries="@array/simulate_color_space_entries"
+ android:entryValues="@array/simulate_color_space_values"
+ android:key="simulate_color_space"
+ android:summary="%s"
+ android:title="@string/simulate_color_space" />
<ListPreference
- android:key="debug_hw_renderer"
- android:title="@string/debug_hw_renderer"
- android:entries="@array/debug_hw_renderer_entries"
- android:entryValues="@array/debug_hw_renderer_values" />
+ android:key="debug_hw_renderer"
+ android:title="@string/debug_hw_renderer"
+ android:entries="@array/debug_hw_renderer_entries"
+ android:entryValues="@array/debug_hw_renderer_values" />
</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"
- android:title="@string/usb_audio_disable_routing"
- android:summary="@string/usb_audio_disable_routing_summary" />
+ android:key="usb_audio"
+ android:title="@string/usb_audio_disable_routing"
+ android:summary="@string/usb_audio_disable_routing_summary" />
</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"
android:title="@string/strict_mode"
- android:summary="@string/strict_mode_summary"/>
+ android:summary="@string/strict_mode_summary" />
<ListPreference
android:key="track_frame_time"
@@ -438,13 +461,15 @@
</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"
android:title="@string/immediately_destroy_activities"
- android:summary="@string/immediately_destroy_activities_summary"/>
+ android:summary="@string/immediately_destroy_activities_summary" />
<ListPreference
android:key="app_process_limit"
@@ -454,52 +479,48 @@
<Preference
- android:key="background_check"
- android:fragment="com.android.settings.applications.appops.BackgroundCheckSummary"
- android:title="@string/background_check_pref" />
+ android:key="background_check"
+ android:fragment="com.android.settings.applications.appops.BackgroundCheckSummary"
+ android:title="@string/background_check_pref" />
<SwitchPreference
android:key="show_first_crash_dialog"
android:title="@string/show_first_crash_dialog"
- android:summary="@string/show_first_crash_dialog_summary"/>
+ android:summary="@string/show_first_crash_dialog_summary" />
<SwitchPreference
android:key="show_all_anrs"
android:title="@string/show_all_anrs"
- android:summary="@string/show_all_anrs_summary"/>
+ android:summary="@string/show_all_anrs_summary" />
<SwitchPreference
android:key="show_notification_channel_warnings"
android:title="@string/show_notification_channel_warnings"
- android:summary="@string/show_notification_channel_warnings_summary"/>
+ android:summary="@string/show_notification_channel_warnings_summary" />
<Preference
- android:key="inactive_apps"
- android:title="@string/inactive_apps_title"
- android:fragment="com.android.settings.fuelgauge.InactiveApps"/>
+ android:key="inactive_apps"
+ android:title="@string/inactive_apps_title"
+ android:fragment="com.android.settings.fuelgauge.InactiveApps" />
<SwitchPreference
android:key="force_allow_on_external"
android:title="@string/force_allow_on_external"
- android:summary="@string/force_allow_on_external_summary"/>
+ android:summary="@string/force_allow_on_external_summary" />
<SwitchPreference
android:key="force_resizable_activities"
android:title="@string/force_resizable_activities"
- android:summary="@string/force_resizable_activities_summary"/>
+ android:summary="@string/force_resizable_activities_summary" />
<SwitchPreference
- android:key="enable_freeform_support"
- android:title="@string/enable_freeform_support"
- android:summary="@string/enable_freeform_support_summary"/>
+ android:key="enable_freeform_support"
+ android:title="@string/enable_freeform_support"
+ android:summary="@string/enable_freeform_support_summary" />
<Preference
android:key="reset_shortcut_manager_throttling"
android:title="@string/reset_shortcut_manager_throttling" />
- </PreferenceCategory>
-
- <PreferenceCategory
- android:key="dashboard_tile_placeholder"
- android:order="200"/>
+ </PreferenceCategory>
</PreferenceScreen>