Delete "Show CPU usage"
This functionality hasn't worked since Lollipop.
This change is functionally identical to packages/app/Settings
commit 73dfef91b2f460a5fd96f0e3208243dbb3558080
Testing: code compiles.
Bug: 21388590
Change-Id: I8a0a9d2a9983845ad605841c73b807c13ed38b4d
diff --git a/Settings/res/values/strings.xml b/Settings/res/values/strings.xml
index 178ba98..9ecfe86 100644
--- a/Settings/res/values/strings.xml
+++ b/Settings/res/values/strings.xml
@@ -962,8 +962,6 @@
<string name="system_animator_duration_scale">Animator duration scale</string>
<!-- Title for Set Strict mode enabled in System Settings Developer options [CHAR LIMIT=50] -->
<string name="system_strict_mode_enabled">Strict mode enabled</string>
- <!-- Title for Set Show CPU usage in System Settings Developer options [CHAR LIMIT=50] -->
- <string name="system_show_cpu_usage">Show CPU usage</string>
<!-- Title for Set Profile GPU rendering in System Settings Developer options [CHAR LIMIT=50] -->
<string name="system_profile_gpu_rendering">Profile GPU rendering</string>
<!-- Title for Set Enable traces in System Settings Developer options [CHAR LIMIT=50] -->
@@ -999,8 +997,6 @@
<string name="system_desc_show_surface_updates">Flash entire window surfaces when they update</string>
<!-- Description for strict mode enabled in System Settings Developer options [CHAR LIMIT=100] -->
<string name="system_desc_strict_mode_enabled">Flash screen when apps do long operations on main thread</string>
- <!-- Description for show cpu usage in System Settings Developer options [CHAR LIMIT=100] -->
- <string name="system_desc_show_cpu_usage">Screen overlay showing current CPU usage</string>
<!-- Description for profile GPU rendering in System Settings Developer options [CHAR LIMIT=100] -->
<string name="system_desc_profile_gpu_rendering">Measure rendering time in adb shell dumpsys gfxinfo</string>
diff --git a/Settings/res/xml/development_prefs.xml b/Settings/res/xml/development_prefs.xml
index e69a5d2..af1be6f 100644
--- a/Settings/res/xml/development_prefs.xml
+++ b/Settings/res/xml/development_prefs.xml
@@ -305,11 +305,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/Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java b/Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java
index 5067849..3ead452 100644
--- a/Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java
+++ b/Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java
@@ -108,7 +108,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";
@@ -204,7 +203,6 @@
private SwitchPreference mShowTouches;
private SwitchPreference mShowScreenUpdates;
private SwitchPreference mDisableOverlays;
- private SwitchPreference mShowCpuUsage;
private SwitchPreference mForceHardwareUi;
private SwitchPreference mForceMsaa;
private SwitchPreference mShowHwScreenUpdates;
@@ -354,7 +352,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);
@@ -596,7 +593,6 @@
updatePointerLocationOptions();
updateShowTouchesOptions();
updateFlingerOptions();
- updateCpuUsageOptions();
updateHardwareUiOptions();
updateMsaaOptions();
updateTrackFrameTimeOptions();
@@ -1321,23 +1317,6 @@
}
}
- private void updateCpuUsageOptions() {
- updateSwitchPreference(mShowCpuUsage,
- Settings.Global.getInt(mContentResolver, Settings.Global.SHOW_PROCESSES, 0) != 0);
- }
-
- private void writeCpuUsageOptions() {
- boolean value = mShowCpuUsage.isChecked();
- Settings.Global.putInt(mContentResolver, 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(
@@ -1608,8 +1587,6 @@
writeShowUpdatesOption();
} else if (preference == mDisableOverlays) {
writeDisableOverlaysOption();
- } else if (preference == mShowCpuUsage) {
- writeCpuUsageOptions();
} else if (preference == mImmediatelyDestroyActivities) {
writeImmediatelyDestroyActivitiesOptions();
} else if (preference == mShowAllANRs) {
