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

Remove now obsolete tracing options

Browse Source 
Change-Id: I8bd79161e0cb88619e2713b18c5f94cc1a12cb87
This commit is contained in:
Chris Craik
2013-01-17 11:23:48 -08:00
parent 6001a7b0d4
commit 87c3ce7667
3 changed files with 0 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/values/strings.xml
View File

@@ -3920,18 +3920,6 @@
<!-- UI debug setting: disable use of overlays summary [CHAR LIMIT=50] --> <!-- UI debug setting: disable use of overlays summary [CHAR LIMIT=50] -->
<string name="disable_overlays_summary">Always use GPU for screen compositing</string> <string name="disable_overlays_summary">Always use GPU for screen compositing</string>
<!-- UI debug setting: enable low-level traces? [CHAR LIMIT=25] -->
<string name="enable_traces_title">Enable traces</string>
<!-- UI debug setting: title for dialog to enable low-level traces [CHAR LIMIT=25] -->
<string name="enable_traces_dialog_title">Select enabled traces</string>
<!-- UI debug setting: enable low-level traces, none enabled summary [CHAR LIMIT=NONE] -->
<string name="enable_traces_summary_none">No traces currently enabled</string>
<!-- UI debug setting: enable low-level traces, some number enabled summary [CHAR LIMIT=NONE] -->
<string name="enable_traces_summary_num"><xliff:g id="num">%1$d</xliff:g> traces currently enabled</string>
<!-- 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] --> <!-- UI debug setting: enable various types of OpenGL traces [CHAR LIMIT=25] -->
<string name="enable_opengl_traces_title">Enable OpenGL traces</string> <string name="enable_opengl_traces_title">Enable OpenGL traces</string>

5
res/xml/development_prefs.xml
View File

@@ -197,11 +197,6 @@
android:entries="@array/enable_opengl_traces_entries" android:entries="@array/enable_opengl_traces_entries"
android:entryValues="@array/enable_opengl_traces_values" /> android:entryValues="@array/enable_opengl_traces_values" />
<MultiCheckPreference
android:key="enable_traces"
android:title="@string/enable_traces_title"
android:dialogTitle="@string/enable_traces_dialog_title" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:key="debug_applications_category" <PreferenceCategory android:key="debug_applications_category"

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

@@ -122,8 +122,6 @@ public class DevelopmentSettings extends PreferenceFragment
private static final String DEBUG_DEBUGGING_CATEGORY_KEY = "debug_debugging_category"; private static final String DEBUG_DEBUGGING_CATEGORY_KEY = "debug_debugging_category";
private static final String OPENGL_TRACES_KEY = "enable_opengl_traces"; private static final String OPENGL_TRACES_KEY = "enable_opengl_traces";
private static final String ENABLE_TRACES_KEY = "enable_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";
@@ -176,7 +174,6 @@ public class DevelopmentSettings extends PreferenceFragment
private ListPreference mAnimatorDurationScale; private ListPreference mAnimatorDurationScale;
private ListPreference mOverlayDisplayDevices; private ListPreference mOverlayDisplayDevices;
private ListPreference mOpenGLTraces; private ListPreference mOpenGLTraces;
private MultiCheckPreference mEnableTracesPref;
private CheckBoxPreference mImmediatelyDestroyActivities; private CheckBoxPreference mImmediatelyDestroyActivities;
private ListPreference mAppProcessLimit; private ListPreference mAppProcessLimit;
@@ -262,15 +259,6 @@ public class DevelopmentSettings extends PreferenceFragment
mOpenGLTraces = (ListPreference) findPreference(OPENGL_TRACES_KEY); mOpenGLTraces = (ListPreference) findPreference(OPENGL_TRACES_KEY);
mAllPrefs.add(mOpenGLTraces); mAllPrefs.add(mOpenGLTraces);
mOpenGLTraces.setOnPreferenceChangeListener(this); mOpenGLTraces.setOnPreferenceChangeListener(this);
mEnableTracesPref = (MultiCheckPreference)findPreference(ENABLE_TRACES_KEY);
String[] traceValues = new String[Trace.TRACE_TAGS.length];
for (int i=Trace.TRACE_FLAGS_START_BIT; i<traceValues.length; i++) {
traceValues[i] = Integer.toString(1<<i);
}
mEnableTracesPref.setEntries(Trace.TRACE_TAGS);
mEnableTracesPref.setEntryValues(traceValues);
mAllPrefs.add(mEnableTracesPref);
mEnableTracesPref.setOnPreferenceChangeListener(this);
mImmediatelyDestroyActivities = (CheckBoxPreference) findPreference( mImmediatelyDestroyActivities = (CheckBoxPreference) findPreference(
IMMEDIATELY_DESTROY_ACTIVITIES_KEY); IMMEDIATELY_DESTROY_ACTIVITIES_KEY);
@@ -430,7 +418,6 @@ public class DevelopmentSettings extends PreferenceFragment
updateAnimationScaleOptions(); updateAnimationScaleOptions();
updateOverlayDisplayDevicesOptions(); updateOverlayDisplayDevicesOptions();
updateOpenGLTracesOptions(); updateOpenGLTracesOptions();
updateEnableTracesOptions();
updateImmediatelyDestroyActivitiesOptions(); updateImmediatelyDestroyActivitiesOptions();
updateAppProcessLimitOptions(); updateAppProcessLimitOptions();
updateShowAllANRsOptions(); updateShowAllANRsOptions();
@@ -452,7 +439,6 @@ public class DevelopmentSettings extends PreferenceFragment
writeAnimationScaleOption(1, mTransitionAnimationScale, null); writeAnimationScaleOption(1, mTransitionAnimationScale, null);
writeAnimationScaleOption(2, mAnimatorDurationScale, null); writeAnimationScaleOption(2, mAnimatorDurationScale, null);
writeOverlayDisplayDevicesOptions(null); writeOverlayDisplayDevicesOptions(null);
writeEnableTracesOptions(0);
writeAppProcessLimitOptions(null); writeAppProcessLimitOptions(null);
mHaveDebugSettings = false; mHaveDebugSettings = false;
updateAllOptions(); updateAllOptions();
@@ -935,47 +921,6 @@ public class DevelopmentSettings extends PreferenceFragment
getActivity().getContentResolver(), Settings.Secure.ANR_SHOW_BACKGROUND, 0) != 0); getActivity().getContentResolver(), Settings.Secure.ANR_SHOW_BACKGROUND, 0) != 0);
} }
private void updateEnableTracesOptions() {
long flags = SystemProperties.getLong(Trace.PROPERTY_TRACE_TAG_ENABLEFLAGS, 0);
String[] values = mEnableTracesPref.getEntryValues();
int numSet = 0;
for (int i=Trace.TRACE_FLAGS_START_BIT; i<values.length; i++) {
boolean set = (flags&(1<<i)) != 0;
mEnableTracesPref.setValue(i-Trace.TRACE_FLAGS_START_BIT, set);
if (set) {
numSet++;
}
}
if (numSet == 0) {
mEnableTracesPref.setSummary(R.string.enable_traces_summary_none);
} else if (numSet == values.length) {
mHaveDebugSettings = true;
mEnableTracesPref.setSummary(R.string.enable_traces_summary_all);
} else {
mHaveDebugSettings = true;
mEnableTracesPref.setSummary(getString(R.string.enable_traces_summary_num, numSet));
}
}
private void writeEnableTracesOptions() {
long value = 0;
String[] values = mEnableTracesPref.getEntryValues();
for (int i=Trace.TRACE_FLAGS_START_BIT; i<values.length; i++) {
if (mEnableTracesPref.getValue(i-Trace.TRACE_FLAGS_START_BIT)) {
value |= 1<<i;
}
}
writeEnableTracesOptions(value);
// Make sure summary is updated.
updateEnableTracesOptions();
}
private void writeEnableTracesOptions(long value) {
SystemProperties.set(Trace.PROPERTY_TRACE_TAG_ENABLEFLAGS,
"0x" + Long.toString(value, 16));
pokeSystemProperties();
}
@Override @Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
if (buttonView == mEnabledSwitch) { if (buttonView == mEnabledSwitch) {
@@ -1125,9 +1070,6 @@ public class DevelopmentSettings extends PreferenceFragment
} else if (preference == mTrackFrameTime) { } else if (preference == mTrackFrameTime) {
writeTrackFrameTimeOptions(newValue); writeTrackFrameTimeOptions(newValue);
return true; return true;
} else if (preference == mEnableTracesPref) {
writeEnableTracesOptions();
return true;
} else if (preference == mAppProcessLimit) { } else if (preference == mAppProcessLimit) {
writeAppProcessLimitOptions(newValue); writeAppProcessLimitOptions(newValue);
return true; return true;