PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove OpenGL traces from dev settings

Browse Source 
Change-Id: I43a23e5e7bf02b798f3ddffdf4c21077ef3d5e2f
Fixes: 26741446
This commit is contained in:
Jason Monk
2016-04-11 10:17:53 -04:00
parent 6599660196
commit 4572249f5d
2 changed files with 0 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/xml/development_prefs.xml
View File

@@ -323,12 +323,6 @@
android:entries="@array/track_frame_time_entries" android:entries="@array/track_frame_time_entries"
android:entryValues="@array/track_frame_time_values" /> android:entryValues="@array/track_frame_time_values" />
<ListPreference
android:key="enable_opengl_traces"
android:title="@string/enable_opengl_traces_title"
android:entries="@array/enable_opengl_traces_entries"
android:entryValues="@array/enable_opengl_traces_values" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:key="debug_applications_category" <PreferenceCategory android:key="debug_applications_category"

32
src/com/android/settings/DevelopmentSettings.java
View File

@@ -186,8 +186,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
private static final String INACTIVE_APPS_KEY = "inactive_apps"; private static final String INACTIVE_APPS_KEY = "inactive_apps";
private static final String OPENGL_TRACES_KEY = "enable_opengl_traces";
private static final String IMMEDIATELY_DESTROY_ACTIVITIES_KEY private static final String IMMEDIATELY_DESTROY_ACTIVITIES_KEY
= "immediately_destroy_activities"; = "immediately_destroy_activities";
private static final String APP_PROCESS_LIMIT_KEY = "app_process_limit"; private static final String APP_PROCESS_LIMIT_KEY = "app_process_limit";
@@ -278,7 +276,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
private ListPreference mTransitionAnimationScale; private ListPreference mTransitionAnimationScale;
private ListPreference mAnimatorDurationScale; private ListPreference mAnimatorDurationScale;
private ListPreference mOverlayDisplayDevices; private ListPreference mOverlayDisplayDevices;
private ListPreference mOpenGLTraces;
private SwitchPreference mWebViewMultiprocess; private SwitchPreference mWebViewMultiprocess;
private ListPreference mWebViewProvider; private ListPreference mWebViewProvider;
@@ -432,7 +429,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
mTransitionAnimationScale = addListPreference(TRANSITION_ANIMATION_SCALE_KEY); mTransitionAnimationScale = addListPreference(TRANSITION_ANIMATION_SCALE_KEY);
mAnimatorDurationScale = addListPreference(ANIMATOR_DURATION_SCALE_KEY); mAnimatorDurationScale = addListPreference(ANIMATOR_DURATION_SCALE_KEY);
mOverlayDisplayDevices = addListPreference(OVERLAY_DISPLAY_DEVICES_KEY); mOverlayDisplayDevices = addListPreference(OVERLAY_DISPLAY_DEVICES_KEY);
mOpenGLTraces = addListPreference(OPENGL_TRACES_KEY);
mSimulateColorSpace = addListPreference(SIMULATE_COLOR_SPACE); mSimulateColorSpace = addListPreference(SIMULATE_COLOR_SPACE);
mUSBAudio = findAndInitSwitchPref(USB_AUDIO_KEY); mUSBAudio = findAndInitSwitchPref(USB_AUDIO_KEY);
mForceResizable = findAndInitSwitchPref(FORCE_RESIZABLE_KEY); mForceResizable = findAndInitSwitchPref(FORCE_RESIZABLE_KEY);
@@ -680,7 +676,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
updateDebugLayoutOptions(); updateDebugLayoutOptions();
updateAnimationScaleOptions(); updateAnimationScaleOptions();
updateOverlayDisplayDevicesOptions(); updateOverlayDisplayDevicesOptions();
updateOpenGLTracesOptions();
updateImmediatelyDestroyActivitiesOptions(); updateImmediatelyDestroyActivitiesOptions();
updateAppProcessLimitOptions(); updateAppProcessLimitOptions();
updateShowAllANRsOptions(); updateShowAllANRsOptions();
@@ -1640,30 +1635,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
updateOverlayDisplayDevicesOptions(); updateOverlayDisplayDevicesOptions();
} }
private void updateOpenGLTracesOptions() {
String value = SystemProperties.get(OPENGL_TRACES_PROPERTY);
if (value == null) {
value = "";
}
CharSequence[] values = mOpenGLTraces.getEntryValues();
for (int i = 0; i < values.length; i++) {
if (value.contentEquals(values[i])) {
mOpenGLTraces.setValueIndex(i);
mOpenGLTraces.setSummary(mOpenGLTraces.getEntries()[i]);
return;
}
}
mOpenGLTraces.setValueIndex(0);
mOpenGLTraces.setSummary(mOpenGLTraces.getEntries()[0]);
}
private void writeOpenGLTracesOptions(Object newValue) {
SystemProperties.set(OPENGL_TRACES_PROPERTY, newValue == null ? "" : newValue.toString());
pokeSystemProperties();
updateOpenGLTracesOptions();
}
private void updateAppProcessLimitOptions() { private void updateAppProcessLimitOptions() {
try { try {
int limit = ActivityManagerNative.getDefault().getProcessLimit(); int limit = ActivityManagerNative.getDefault().getProcessLimit();
@@ -1995,9 +1966,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
} else if (preference == mOverlayDisplayDevices) { } else if (preference == mOverlayDisplayDevices) {
writeOverlayDisplayDevicesOptions(newValue); writeOverlayDisplayDevicesOptions(newValue);
return true; return true;
} else if (preference == mOpenGLTraces) {
writeOpenGLTracesOptions(newValue);
return true;
} else if (preference == mTrackFrameTime) { } else if (preference == mTrackFrameTime) {
writeTrackFrameTimeOptions(newValue); writeTrackFrameTimeOptions(newValue);
return true; return true;