Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-dev

This commit is contained in:
Romain Guy
2012-10-18 18:09:48 -07:00
committed by Android (Google) Code Review
4 changed files with 60 additions and 0 deletions

View File

@@ -670,6 +670,22 @@
<item>1280x720/213;1920x1080/320</item>
</string-array>
<!-- Titles for OpenGL traces preference. [CHAR LIMIT=35] -->
<string-array name="enable_opengl_traces_entries">
<item>None</item>
<item>Logcat</item>
<item>Systrace (Graphics)</item>
<item>Call stack on glGetError</item>
</string-array>
<!-- Values for OpenGL traces preference. -->
<string-array name="enable_opengl_traces_values" translatable="false" >
<item>0</item>
<item>1</item>
<item>systrace</item>
<item>error</item>
</string-array>
<!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
<string-array name="app_process_limit_entries">
<item>Standard limit</item>

View File

@@ -3954,6 +3954,9 @@
<!-- UI debug setting: enable low-level traces, all enabled summary [CHAR LIMIT=NONE] -->
<string name="enable_traces_summary_all">All traces currently enabled</string>
<!-- UI debug setting: enable various types of OpenGL traces [CHAR LIMIT=25] -->
<string name="enable_opengl_traces_title">Enable OpenGL traces</string>
<!-- UI debug setting: show layout bounds information [CHAR LIMIT=25] -->
<string name="debug_layout">Show layout bounds</string>
<!-- UI debug setting: show layout bounds information summary [CHAR LIMIT=50] -->

View File

@@ -188,6 +188,13 @@
android:title="@string/track_frame_time"
android:summary="@string/track_frame_time_summary"/>
<ListPreference
android:key="enable_opengl_traces"
android:title="@string/enable_opengl_traces_title"
android:persistent="false"
android:entries="@array/enable_opengl_traces_entries"
android:entryValues="@array/enable_opengl_traces_values" />
<MultiCheckPreference
android:key="enable_traces"
android:title="@string/enable_traces_title"