diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-05-08 18:55:30 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-08 18:55:30 -0700 |
| commit | 821a4d8c34e9a60f2f349ff63436c2ea0379ce9c (patch) | |
| tree | 56384bcd82802f28dd1ada3c2bf7e3b22eb645e1 /res/xml | |
| parent | a1f57c7970f7ed2ee8fec7b4967a63ace17a0d61 (diff) | |
| parent | 34481b9cd4a589d35f59b1e504cf02f4595f0d92 (diff) | |
| download | packages_apps_settings-821a4d8c34e9a60f2f349ff63436c2ea0379ce9c.zip packages_apps_settings-821a4d8c34e9a60f2f349ff63436c2ea0379ce9c.tar.gz packages_apps_settings-821a4d8c34e9a60f2f349ff63436c2ea0379ce9c.tar.bz2 | |
Merge "Settings to control traces." into jb-dev
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/development_prefs.xml | 79 |
1 files changed, 47 insertions, 32 deletions
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml index 0307a6f..9788864 100644 --- a/res/xml/development_prefs.xml +++ b/res/xml/development_prefs.xml @@ -62,23 +62,23 @@ </PreferenceCategory> - <PreferenceCategory android:key="debug_ui_category" - android:title="@string/debug_ui_category"> + <PreferenceCategory android:key="debug_input_category" + android:title="@string/debug_input_category"> <CheckBoxPreference - android:key="strict_mode" - android:title="@string/strict_mode" - android:summary="@string/strict_mode_summary"/> + android:key="show_touches" + android:title="@string/show_touches" + android:summary="@string/show_touches_summary"/> <CheckBoxPreference android:key="pointer_location" android:title="@string/pointer_location" android:summary="@string/pointer_location_summary"/> - <CheckBoxPreference - android:key="show_touches" - android:title="@string/show_touches" - android:summary="@string/show_touches_summary"/> + </PreferenceCategory> + + <PreferenceCategory android:key="debug_drawing_category" + android:title="@string/debug_drawing_category"> <CheckBoxPreference android:key="debug_layout" @@ -86,34 +86,14 @@ android:summary="@string/debug_layout_summary"/> <CheckBoxPreference - android:key="show_screen_updates" - android:title="@string/show_screen_updates" - android:summary="@string/show_screen_updates_summary"/> - - <CheckBoxPreference - android:key="disable_overlays" - android:title="@string/disable_overlays" - android:summary="@string/disable_overlays_summary"/> - - <CheckBoxPreference - android:key="show_cpu_usage" - android:title="@string/show_cpu_usage" - android:summary="@string/show_cpu_usage_summary"/> - - <CheckBoxPreference - android:key="force_hw_ui" - android:title="@string/force_hw_ui" - android:summary="@string/force_hw_ui_summary"/> - - <CheckBoxPreference android:key="show_hw_screen_udpates" android:title="@string/show_hw_screen_updates" android:summary="@string/show_hw_screen_updates_summary"/> <CheckBoxPreference - android:key="track_frame_time" - android:title="@string/track_frame_time" - android:summary="@string/track_frame_time_summary"/> + android:key="show_screen_updates" + android:title="@string/show_screen_updates" + android:summary="@string/show_screen_updates_summary"/> <ListPreference android:key="window_animation_scale" @@ -136,6 +116,41 @@ android:entries="@array/animator_duration_scale_entries" android:entryValues="@array/animator_duration_scale_values" /> + <CheckBoxPreference + android:key="disable_overlays" + android:title="@string/disable_overlays" + android:summary="@string/disable_overlays_summary"/> + + <CheckBoxPreference + android:key="force_hw_ui" + android:title="@string/force_hw_ui" + android:summary="@string/force_hw_ui_summary"/> + + </PreferenceCategory> + + <PreferenceCategory android:key="debug_monitoring_category" + android:title="@string/debug_monitoring_category"> + + <CheckBoxPreference + android:key="strict_mode" + android:title="@string/strict_mode" + android:summary="@string/strict_mode_summary"/> + + <CheckBoxPreference + android:key="show_cpu_usage" + android:title="@string/show_cpu_usage" + android:summary="@string/show_cpu_usage_summary"/> + + <CheckBoxPreference + android:key="track_frame_time" + android:title="@string/track_frame_time" + android:summary="@string/track_frame_time_summary"/> + + <MultiCheckPreference + android:key="enable_traces" + android:title="@string/enable_traces_title" + android:dialogTitle="@string/enable_traces_dialog_title" /> + </PreferenceCategory> <PreferenceCategory android:key="debug_applications_category" |