From 6b24c458139091836486cce774a2e1255668e001 Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Mon, 25 Feb 2013 16:21:58 -0800 Subject: [PATCH] Add non-rectangular clip debug setting This change also reorganizes settings a little bit. A new section called "Hardware accelerated rendering" now hosts all the 2D/GPU related settings. Change-Id: Ife2d466b94d69310c2056c3dcf5c13737319f989 --- res/values/arrays.xml | 14 ++++ res/values/strings.xml | 6 ++ res/xml/development_prefs.xml | 82 +++++++++++-------- .../android/settings/DevelopmentSettings.java | 70 ++++++++++------ 4 files changed, 114 insertions(+), 58 deletions(-) diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 42154f47d1b..23c6c8205be 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -765,6 +765,20 @@ error + + + Off + Draw non-rectangular clip region in blue + Highlight tested drawing commands in green + + + + + hide + region + highlight + + Off diff --git a/res/values/strings.xml b/res/values/strings.xml index 57dbcaef46c..c15d3151215 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3873,6 +3873,9 @@ Drawing + + Hardware accelerated rendering + Monitoring @@ -3940,6 +3943,9 @@ Enable 4x MSAA in OpenGL ES 2.0 apps + + Debug non-rectangular clip operations + Profile GPU rendering diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml index c199b1d35e5..6fbbbf4ce02 100644 --- a/res/xml/development_prefs.xml +++ b/res/xml/development_prefs.xml @@ -103,31 +103,16 @@ - - - - - - - - + + - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java index f37b5f8d89c..4dfe700d65a 100644 --- a/src/com/android/settings/DevelopmentSettings.java +++ b/src/com/android/settings/DevelopmentSettings.java @@ -46,11 +46,9 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.StrictMode; import android.os.SystemProperties; -import android.os.Trace; import android.os.UserHandle; import android.preference.CheckBoxPreference; import android.preference.ListPreference; -import android.preference.MultiCheckPreference; import android.preference.Preference; import android.preference.Preference.OnPreferenceChangeListener; import android.preference.PreferenceFragment; @@ -114,6 +112,7 @@ public class DevelopmentSettings extends PreferenceFragment private static final String FORCE_HARDWARE_UI_KEY = "force_hw_ui"; private static final String FORCE_MSAA_KEY = "force_msaa"; private static final String TRACK_FRAME_TIME_KEY = "track_frame_time"; + private static final String SHOW_NON_RECTANGULAR_CLIP_KEY = "show_non_rect_clip"; private static final String SHOW_HW_SCREEN_UPDATES_KEY = "show_hw_screen_udpates"; private static final String SHOW_HW_LAYERS_UPDATES_KEY = "show_hw_layers_udpates"; private static final String SHOW_HW_OVERDRAW_KEY = "show_hw_overdraw"; @@ -173,6 +172,7 @@ public class DevelopmentSettings extends PreferenceFragment private CheckBoxPreference mShowHwOverdraw; private CheckBoxPreference mDebugLayout; private ListPreference mTrackFrameTime; + private ListPreference mShowNonRectClip; private ListPreference mWindowAnimationScale; private ListPreference mTransitionAnimationScale; private ListPreference mAnimatorDurationScale; @@ -252,36 +252,23 @@ public class DevelopmentSettings extends PreferenceFragment mShowCpuUsage = findAndInitCheckboxPref(SHOW_CPU_USAGE_KEY); mForceHardwareUi = findAndInitCheckboxPref(FORCE_HARDWARE_UI_KEY); mForceMsaa = findAndInitCheckboxPref(FORCE_MSAA_KEY); - mTrackFrameTime = (ListPreference) findPreference(TRACK_FRAME_TIME_KEY); - mAllPrefs.add(mTrackFrameTime); - mTrackFrameTime.setOnPreferenceChangeListener(this); + mTrackFrameTime = addListPreference(TRACK_FRAME_TIME_KEY); + mShowNonRectClip = addListPreference(SHOW_NON_RECTANGULAR_CLIP_KEY); mShowHwScreenUpdates = findAndInitCheckboxPref(SHOW_HW_SCREEN_UPDATES_KEY); mShowHwLayersUpdates = findAndInitCheckboxPref(SHOW_HW_LAYERS_UPDATES_KEY); mShowHwOverdraw = findAndInitCheckboxPref(SHOW_HW_OVERDRAW_KEY); mDebugLayout = findAndInitCheckboxPref(DEBUG_LAYOUT_KEY); - mWindowAnimationScale = (ListPreference) findPreference(WINDOW_ANIMATION_SCALE_KEY); - mAllPrefs.add(mWindowAnimationScale); - mWindowAnimationScale.setOnPreferenceChangeListener(this); - mTransitionAnimationScale = (ListPreference) findPreference(TRANSITION_ANIMATION_SCALE_KEY); - mAllPrefs.add(mTransitionAnimationScale); - mTransitionAnimationScale.setOnPreferenceChangeListener(this); - mAnimatorDurationScale = (ListPreference) findPreference(ANIMATOR_DURATION_SCALE_KEY); - mAllPrefs.add(mAnimatorDurationScale); - mAnimatorDurationScale.setOnPreferenceChangeListener(this); - mOverlayDisplayDevices = (ListPreference) findPreference(OVERLAY_DISPLAY_DEVICES_KEY); - mAllPrefs.add(mOverlayDisplayDevices); - mOverlayDisplayDevices.setOnPreferenceChangeListener(this); - mOpenGLTraces = (ListPreference) findPreference(OPENGL_TRACES_KEY); - mAllPrefs.add(mOpenGLTraces); - mOpenGLTraces.setOnPreferenceChangeListener(this); + mWindowAnimationScale = addListPreference(WINDOW_ANIMATION_SCALE_KEY); + mTransitionAnimationScale = addListPreference(TRANSITION_ANIMATION_SCALE_KEY); + mAnimatorDurationScale = addListPreference(ANIMATOR_DURATION_SCALE_KEY); + mOverlayDisplayDevices = addListPreference(OVERLAY_DISPLAY_DEVICES_KEY); + mOpenGLTraces = addListPreference(OPENGL_TRACES_KEY); mImmediatelyDestroyActivities = (CheckBoxPreference) findPreference( IMMEDIATELY_DESTROY_ACTIVITIES_KEY); mAllPrefs.add(mImmediatelyDestroyActivities); mResetCbPrefs.add(mImmediatelyDestroyActivities); - mAppProcessLimit = (ListPreference) findPreference(APP_PROCESS_LIMIT_KEY); - mAllPrefs.add(mAppProcessLimit); - mAppProcessLimit.setOnPreferenceChangeListener(this); + mAppProcessLimit = addListPreference(APP_PROCESS_LIMIT_KEY); mShowAllANRs = (CheckBoxPreference) findPreference( SHOW_ALL_ANRS_KEY); @@ -295,6 +282,13 @@ public class DevelopmentSettings extends PreferenceFragment removeHdcpOptionsForProduction(); } + private ListPreference addListPreference(String prefKey) { + ListPreference pref = (ListPreference) findPreference(prefKey); + mAllPrefs.add(pref); + pref.setOnPreferenceChangeListener(this); + return pref; + } + private void disableForUser(Preference pref) { if (pref != null) { pref.setEnabled(false); @@ -426,6 +420,7 @@ public class DevelopmentSettings extends PreferenceFragment updateHardwareUiOptions(); updateMsaaOptions(); updateTrackFrameTimeOptions(); + updateShowNonRectClipOptions(); updateShowHwScreenUpdatesOptions(); updateShowHwLayersUpdatesOptions(); updateShowHwOverdrawOptions(); @@ -735,6 +730,32 @@ public class DevelopmentSettings extends PreferenceFragment updateTrackFrameTimeOptions(); } + private void updateShowNonRectClipOptions() { + String value = SystemProperties.get( + HardwareRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY); + if (value == null) { + value = "hide"; + } + + CharSequence[] values = mShowNonRectClip.getEntryValues(); + for (int i = 0; i < values.length; i++) { + if (value.contentEquals(values[i])) { + mShowNonRectClip.setValueIndex(i); + mShowNonRectClip.setSummary(mShowNonRectClip.getEntries()[i]); + return; + } + } + mShowNonRectClip.setValueIndex(0); + mShowNonRectClip.setSummary(mShowNonRectClip.getEntries()[0]); + } + + private void writeShowNonRectClipOptions(Object newValue) { + SystemProperties.set(HardwareRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY, + newValue == null ? "" : newValue.toString()); + pokeSystemProperties(); + updateShowNonRectClipOptions(); + } + private void updateShowHwScreenUpdatesOptions() { updateCheckBox(mShowHwScreenUpdates, SystemProperties.getBoolean(HardwareRenderer.DEBUG_DIRTY_REGIONS_PROPERTY, false)); @@ -1092,6 +1113,9 @@ public class DevelopmentSettings extends PreferenceFragment } else if (preference == mTrackFrameTime) { writeTrackFrameTimeOptions(newValue); return true; + } else if (preference == mShowNonRectClip) { + writeShowNonRectClipOptions(newValue); + return true; } else if (preference == mAppProcessLimit) { writeAppProcessLimitOptions(newValue); return true;