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

Merge "Delete "Show CPU usage"" into nyc-mr1-dev

Browse Source
This commit is contained in:
Nick Kralevich
2016-10-11 18:03:25 +00:00
committed by Android (Google) Code Review
parent 9f8644c04f 73dfef91b2
commit 09d3961326
2 changed files with 0 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/xml/development_prefs.xml
View File

@@ -328,11 +328,6 @@
android:title="@string/strict_mode" android:title="@string/strict_mode"
android:summary="@string/strict_mode_summary"/> android:summary="@string/strict_mode_summary"/>
<SwitchPreference
android:key="show_cpu_usage"
android:title="@string/show_cpu_usage"
android:summary="@string/show_cpu_usage_summary"/>
<ListPreference <ListPreference
android:key="track_frame_time" android:key="track_frame_time"
android:title="@string/track_frame_time" android:title="@string/track_frame_time"

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

@@ -144,7 +144,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
private static final String DISABLE_OVERLAYS_KEY = "disable_overlays"; private static final String DISABLE_OVERLAYS_KEY = "disable_overlays";
private static final String SIMULATE_COLOR_SPACE = "simulate_color_space"; private static final String SIMULATE_COLOR_SPACE = "simulate_color_space";
private static final String USB_AUDIO_KEY = "usb_audio"; private static final String USB_AUDIO_KEY = "usb_audio";
private static final String SHOW_CPU_USAGE_KEY = "show_cpu_usage";
private static final String FORCE_HARDWARE_UI_KEY = "force_hw_ui"; private static final String FORCE_HARDWARE_UI_KEY = "force_hw_ui";
private static final String FORCE_MSAA_KEY = "force_msaa"; private static final String FORCE_MSAA_KEY = "force_msaa";
private static final String TRACK_FRAME_TIME_KEY = "track_frame_time"; private static final String TRACK_FRAME_TIME_KEY = "track_frame_time";
@@ -274,7 +273,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
private SwitchPreference mShowTouches; private SwitchPreference mShowTouches;
private SwitchPreference mShowScreenUpdates; private SwitchPreference mShowScreenUpdates;
private SwitchPreference mDisableOverlays; private SwitchPreference mDisableOverlays;
private SwitchPreference mShowCpuUsage;
private SwitchPreference mForceHardwareUi; private SwitchPreference mForceHardwareUi;
private SwitchPreference mForceMsaa; private SwitchPreference mForceMsaa;
private SwitchPreference mShowHwScreenUpdates; private SwitchPreference mShowHwScreenUpdates;
@@ -423,7 +421,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
mShowTouches = findAndInitSwitchPref(SHOW_TOUCHES_KEY); mShowTouches = findAndInitSwitchPref(SHOW_TOUCHES_KEY);
mShowScreenUpdates = findAndInitSwitchPref(SHOW_SCREEN_UPDATES_KEY); mShowScreenUpdates = findAndInitSwitchPref(SHOW_SCREEN_UPDATES_KEY);
mDisableOverlays = findAndInitSwitchPref(DISABLE_OVERLAYS_KEY); mDisableOverlays = findAndInitSwitchPref(DISABLE_OVERLAYS_KEY);
mShowCpuUsage = findAndInitSwitchPref(SHOW_CPU_USAGE_KEY);
mForceHardwareUi = findAndInitSwitchPref(FORCE_HARDWARE_UI_KEY); mForceHardwareUi = findAndInitSwitchPref(FORCE_HARDWARE_UI_KEY);
mForceMsaa = findAndInitSwitchPref(FORCE_MSAA_KEY); mForceMsaa = findAndInitSwitchPref(FORCE_MSAA_KEY);
mTrackFrameTime = addListPreference(TRACK_FRAME_TIME_KEY); mTrackFrameTime = addListPreference(TRACK_FRAME_TIME_KEY);
@@ -696,7 +693,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
updatePointerLocationOptions(); updatePointerLocationOptions();
updateShowTouchesOptions(); updateShowTouchesOptions();
updateFlingerOptions(); updateFlingerOptions();
updateCpuUsageOptions();
updateHardwareUiOptions(); updateHardwareUiOptions();
updateMsaaOptions(); updateMsaaOptions();
updateTrackFrameTimeOptions(); updateTrackFrameTimeOptions();
@@ -1719,25 +1715,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
} }
} }
private void updateCpuUsageOptions() {
updateSwitchPreference(mShowCpuUsage,
Settings.Global.getInt(getActivity().getContentResolver(),
Settings.Global.SHOW_PROCESSES, 0) != 0);
}
private void writeCpuUsageOptions() {
boolean value = mShowCpuUsage.isChecked();
Settings.Global.putInt(getActivity().getContentResolver(),
Settings.Global.SHOW_PROCESSES, value ? 1 : 0);
Intent service = (new Intent())
.setClassName("com.android.systemui", "com.android.systemui.LoadAverageService");
if (value) {
getActivity().startService(service);
} else {
getActivity().stopService(service);
}
}
private void writeImmediatelyDestroyActivitiesOptions() { private void writeImmediatelyDestroyActivitiesOptions() {
try { try {
ActivityManagerNative.getDefault().setAlwaysFinish( ActivityManagerNative.getDefault().setAlwaysFinish(
@@ -2026,8 +2003,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
writeShowUpdatesOption(); writeShowUpdatesOption();
} else if (preference == mDisableOverlays) { } else if (preference == mDisableOverlays) {
writeDisableOverlaysOption(); writeDisableOverlaysOption();
} else if (preference == mShowCpuUsage) {
writeCpuUsageOptions();
} else if (preference == mImmediatelyDestroyActivities) { } else if (preference == mImmediatelyDestroyActivities) {
writeImmediatelyDestroyActivitiesOptions(); writeImmediatelyDestroyActivitiesOptions();
} else if (preference == mShowAllANRs) { } else if (preference == mShowAllANRs) {