From a4eaa6bbcfb170374bdc7728848a14970dfa1eaa Mon Sep 17 00:00:00 2001
From: zilmar <zilmar@pj64-emu.com>
Date: Fri, 12 Aug 2016 23:43:38 +1000
Subject: [PATCH] [Android] Add Cpu Usage

---
 Android/res/values/strings.xml                           | 2 ++
 Android/res/xml/settings_advanced.xml                    | 4 ++++
 Android/src/emu/project64/settings/SettingsActivity.java | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/Android/res/values/strings.xml b/Android/res/values/strings.xml
index 2adc098eb..5d3256c47 100644
--- a/Android/res/values/strings.xml
+++ b/Android/res/values/strings.xml
@@ -113,6 +113,8 @@
     <string name="Recompiler">Recompiler</string>
     <string name="SyncCores">Synchronize Cores</string>
     <string name="Advanced">Advanced</string>
+    <string name="CpuUsage_title">CPU Usage</string>
+    <string name="CpuUsage_summary">Show the cpu used by different components</string>
     <string name="DisplaySpeed_title">Display Speed</string>
     <string name="DisplaySpeed_summary">Show the speed of the emulation</string>
     <string name="DisplaySpeedDisplay">Display Speed Display</string>
diff --git a/Android/res/xml/settings_advanced.xml b/Android/res/xml/settings_advanced.xml
index 47ce3dd3c..83cfe491d 100644
--- a/Android/res/xml/settings_advanced.xml
+++ b/Android/res/xml/settings_advanced.xml
@@ -19,6 +19,10 @@
             android:key="Debugger_GenerateLogFiles"
             android:summary="@string/GenerateLogFiles_summary"
             android:title="@string/GenerateLogFiles_title" />
+        <CheckBoxPreference
+            android:key="Debugger_CpuUsage"
+            android:summary="@string/CpuUsage_summary"
+            android:title="@string/CpuUsage_title" />
         <CheckBoxPreference
             android:key="Debugger_DisplaySpeed"
             android:summary="@string/DisplaySpeed_summary"
diff --git a/Android/src/emu/project64/settings/SettingsActivity.java b/Android/src/emu/project64/settings/SettingsActivity.java
index d50173099..3f8ff73f2 100644
--- a/Android/src/emu/project64/settings/SettingsActivity.java
+++ b/Android/src/emu/project64/settings/SettingsActivity.java
@@ -55,6 +55,7 @@ public class SettingsActivity extends AppCompatActivity implements SharedPrefere
         .putBoolean("Debugger_Enabled",NativeExports.SettingsLoadBool(SettingsID.Debugger_Enabled.getValue()))
         .putBoolean("Debugger_GenerateLogFiles",NativeExports.SettingsLoadBool(SettingsID.Debugger_GenerateLogFiles.getValue()))
         .putBoolean("Debugger_DisplaySpeed",NativeExports.SettingsLoadBool(SettingsID.UserInterface_DisplayFrameRate.getValue()))
+        .putBoolean("Debugger_CpuUsage",NativeExports.SettingsLoadBool(SettingsID.UserInterface_ShowCPUPer.getValue()))
         .putString("Debugger_DisplaySpeedType",String.valueOf(NativeExports.SettingsLoadDword(SettingsID.UserInterface_FrameDisplayType.getValue())))
         .putString("Debugger_TraceMD5",String.valueOf(NativeExports.SettingsLoadDword(SettingsID.Debugger_TraceMD5.getValue())))
         .putString("Debugger_TraceThread",String.valueOf(NativeExports.SettingsLoadDword(SettingsID.Debugger_TraceThread.getValue())))
@@ -120,6 +121,7 @@ public class SettingsActivity extends AppCompatActivity implements SharedPrefere
        	else if (key.equals("audio_Enabled")) { NativeExports.SettingsSaveBool(SettingsID.Plugin_EnableAudio.getValue(), sharedPreferences.getBoolean(key,false)); }
        	else if (key.equals("Debugger_Enabled")) { NativeExports.SettingsSaveBool(SettingsID.Debugger_Enabled.getValue(), sharedPreferences.getBoolean(key,false)); }
     	else if (key.equals("Debugger_GenerateLogFiles")) { NativeExports.SettingsSaveBool(SettingsID.Debugger_GenerateLogFiles.getValue(), sharedPreferences.getBoolean(key,false)); }
+    	else if (key.equals("Debugger_CpuUsage")) { NativeExports.SettingsSaveBool(SettingsID.UserInterface_ShowCPUPer.getValue(), sharedPreferences.getBoolean(key,false)); }
     	else if (key.equals("Debugger_DisplaySpeed")) { NativeExports.SettingsSaveBool(SettingsID.UserInterface_DisplayFrameRate.getValue(), sharedPreferences.getBoolean(key,false)); }
     	else if (key.equals("Debugger_DisplaySpeedType")) { NativeExports.SettingsSaveDword(SettingsID.UserInterface_FrameDisplayType.getValue(), Integer.valueOf(sharedPreferences.getString(key, "0"))); }
     	else if (key.equals("Debugger_TraceMD5")) { NativeExports.SettingsSaveDword(SettingsID.Debugger_TraceMD5.getValue(), Integer.valueOf(sharedPreferences.getString(key, "1"))); }