Delete "Show CPU usage"
This functionality hasn't worked since Lollipop.
Bug: 21388590
Change-Id: Ie3684ba0f8b3a5f577462e4cc4a1ceba53931eff
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index cd3c5ee..d84b008 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -328,11 +328,6 @@
android:title="@string/strict_mode"
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
android:key="track_frame_time"
android:title="@string/track_frame_time"
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 08eae1a..a77f7b1 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -144,7 +144,6 @@
private static final String DISABLE_OVERLAYS_KEY = "disable_overlays";
private static final String SIMULATE_COLOR_SPACE = "simulate_color_space";
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_MSAA_KEY = "force_msaa";
private static final String TRACK_FRAME_TIME_KEY = "track_frame_time";
@@ -274,7 +273,6 @@
private SwitchPreference mShowTouches;
private SwitchPreference mShowScreenUpdates;
private SwitchPreference mDisableOverlays;
- private SwitchPreference mShowCpuUsage;
private SwitchPreference mForceHardwareUi;
private SwitchPreference mForceMsaa;
private SwitchPreference mShowHwScreenUpdates;
@@ -423,7 +421,6 @@
mShowTouches = findAndInitSwitchPref(SHOW_TOUCHES_KEY);
mShowScreenUpdates = findAndInitSwitchPref(SHOW_SCREEN_UPDATES_KEY);
mDisableOverlays = findAndInitSwitchPref(DISABLE_OVERLAYS_KEY);
- mShowCpuUsage = findAndInitSwitchPref(SHOW_CPU_USAGE_KEY);
mForceHardwareUi = findAndInitSwitchPref(FORCE_HARDWARE_UI_KEY);
mForceMsaa = findAndInitSwitchPref(FORCE_MSAA_KEY);
mTrackFrameTime = addListPreference(TRACK_FRAME_TIME_KEY);
@@ -696,7 +693,6 @@
updatePointerLocationOptions();
updateShowTouchesOptions();
updateFlingerOptions();
- updateCpuUsageOptions();
updateHardwareUiOptions();
updateMsaaOptions();
updateTrackFrameTimeOptions();
@@ -1719,25 +1715,6 @@
}
}
- 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() {
try {
ActivityManagerNative.getDefault().setAlwaysFinish(
@@ -2026,8 +2003,6 @@
writeShowUpdatesOption();
} else if (preference == mDisableOverlays) {
writeDisableOverlaysOption();
- } else if (preference == mShowCpuUsage) {
- writeCpuUsageOptions();
} else if (preference == mImmediatelyDestroyActivities) {
writeImmediatelyDestroyActivitiesOptions();
} else if (preference == mShowAllANRs) {