[Android] Add the option to show the on-screen FPS counter.

4 files changed, 40 insertions, 26 deletions

diff --git a/Source/Android/res/values-ja/strings.xml b/Source/Android/res/values-ja/strings.xml
index 71cdcd47b3..9e53c0a9c7 100644
--- a/Source/Android/res/values-ja/strings.xml
+++ b/Source/Android/res/values-ja/strings.xml
@@ -80,6 +80,8 @@
     <string name="opengl_es3">OpenGL ES 3</string>
     <string name="video_backend">ビデオレンダラ</string>
     <string name="video_backend_to_use">使用するビデオレンダラー</string>
+    <string name="show_fps">FPSを表示</string>
+    <string name="show_fps_descrip">エミュレーション速度の指標として、画面左上に毎秒レンダリングされた フレーム数を表示します。</string>
     <string name="draw_onscreen_controls">画面上のコントロールを描画</string>
     
     <string name="enhancements">画質向上の設定</string>
diff --git a/Source/Android/res/values/strings.xml b/Source/Android/res/values/strings.xml
index 99522f5f00..bf9fd9eaa1 100644
--- a/Source/Android/res/values/strings.xml
+++ b/Source/Android/res/values/strings.xml
@@ -80,6 +80,8 @@
     <string name="opengl_es3">OpenGL ES 3</string>
     <string name="video_backend">Video Backend</string>
     <string name="video_backend_to_use">Video backend to use</string>
+    <string name="show_fps">Show FPS</string>
+    <string name="show_fps_descrip">Show the number of frames rendered per second as a measure of emulation speed.</string>
     <string name="draw_onscreen_controls">Draw on-screen controls</string>
     
     <string name="enhancements">Enhancements</string>
diff --git a/Source/Android/res/xml/video_prefs.xml b/Source/Android/res/xml/video_prefs.xml
index ec0c1837f7..6ec29c13a0 100644
--- a/Source/Android/res/xml/video_prefs.xml
+++ b/Source/Android/res/xml/video_prefs.xml
@@ -3,66 +3,66 @@
     
     <!-- Video Settings -->
 
-        
+
     <!-- Video Enhancements -->
     <PreferenceScreen android:title="@string/enhancements">
-        
+
         <ListPreference
             android:entries="@array/internalResolutionEntries"
             android:entryValues="@array/internalResolutionValues"
             android:key="internalResolution"
             android:summary="@string/internal_resolution_descrip"
             android:title="@string/internal_resolution"/>
-        
+
         <ListPreference 
             android:entries="@array/anisotropicFilteringEntries"
             android:entryValues="@array/anisotropicFilteringValues"
             android:key="anisotropicFiltering"
             android:summary="@string/anisotropic_filtering_descrip"
             android:title="@string/anisotropic_filtering"/>
-        
+
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="scaledEFBCopy"
             android:summary="@string/scaled_efb_copy_descrip"
             android:title="@string/scaled_efb_copy"/>
-        
+
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="perPixelLighting"
             android:summary="@string/per_pixel_lighting_descrip"
             android:title="@string/per_pixel_lighting"/>
-        
+
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="forceTextureFiltering"
             android:summary="@string/force_texture_filtering_descrip"
             android:title="@string/force_texture_filtering"/>
-        
+
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="disableFog"
             android:summary="@string/disable_fog_descrip"
             android:title="@string/disable_fog"/>
-        
+
     </PreferenceScreen>
-    
+
     <!-- Video Hacks -->
     <PreferenceScreen android:title="@string/hacks">
         <PreferenceCategory android:title="@string/embedded_frame_buffer">
-            
+
          <CheckBoxPreference
              android:defaultValue="false"
              android:key="skipEFBAccess"
              android:summary="@string/skip_efb_access_descrip"
              android:title="@string/skip_efb_access"/>
-         
+
          <CheckBoxPreference
              android:defaultValue="true"
              android:key="ignoreFormatChanges"
              android:summary="@string/ignore_format_changes_descrip" 
              android:title="@string/ignore_format_changes"/>
-         
+
          <ListPreference
              android:defaultValue="Texture"
              android:entries="@array/efbCopyMethodEntries"
@@ -70,9 +70,9 @@
              android:key="efbCopyMethod"
              android:summary="@string/efb_copy_method_descrip"
              android:title="@string/efb_copy_method"/>
-         
+
      </PreferenceCategory>
-         
+
         <!-- Texture Cache -->
         <PreferenceCategory android:title="@string/texture_cache">
          <ListPreference
@@ -83,7 +83,7 @@
              android:summary="@string/texture_cache_accuracy_descrip"
              android:title="@string/texture_cache_accuracy"/>
         </PreferenceCategory>
-        
+
         <!-- External Frame Buffer -->
         <PreferenceCategory android:title="@string/external_frame_buffer">
         <ListPreference
@@ -94,36 +94,41 @@
             android:summary="@string/external_frame_buffer_descrip"
             android:title="@string/external_frame_buffer"/>
         </PreferenceCategory>
-        
-        
+
+
         <!-- Other Hacks -->
         <PreferenceCategory android:title="@string/other">
-            
+
             <CheckBoxPreference
                 android:defaultValue="false"
                 android:key="cacheDisplayLists"
                 android:summary="@string/cache_display_lists_descrip"
                 android:title="@string/cache_display_lists"/>
-            
+
             <CheckBoxPreference
                 android:defaultValue="false"
                 android:key="disableDestinationAlpha"
                 android:summary="@string/disable_destination_alpha_descrip"
                 android:title="@string/disable_destination_alpha"/>
-            
+
             <CheckBoxPreference 
                 android:defaultValue="true"
                 android:key="fastDepthCalculation"
                 android:summary="@string/fast_depth_calculation_descrip"
                 android:title="@string/fast_depth_calculation"/>
-            
+
         </PreferenceCategory>
     </PreferenceScreen>
-     
+
     <ListPreference
-           android:key="gpuPref"
-           android:summary="@string/video_backend_to_use"
-           android:title="@string/video_backend" />
+       android:key="gpuPref"
+       android:summary="@string/video_backend_to_use"
+       android:title="@string/video_backend" />
+
+    <CheckBoxPreference
+       android:key="showFPS"
+       android:summary="@string/show_fps_descrip"
+       android:title="@string/show_fps"/>
     
     <CheckBoxPreference
         android:defaultValue="true"
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java
index 7f4840b9a2..08d6ee2021 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java
@@ -37,7 +37,8 @@ public final class UserPreferences
 		editor.putString("cpuCorePref",   getConfig("Dolphin.ini", "Core", "CPUCore", "3"));
 		editor.putBoolean("dualCorePref", getConfig("Dolphin.ini", "Core", "CPUThread", "False").equals("True"));
 
-		editor.putString("gpuPref",              getConfig("Dolphin.ini", "Core", "GFXBackend ", "Software Renderer"));
+		editor.putString("gpuPref",               getConfig("Dolphin.ini", "Core", "GFXBackend ", "Software Renderer"));
+		editor.putBoolean("showFPS",              getConfig("gfx_opengl.ini", "Settings", "ShowFPS", "False").equals("True"));
 		editor.putBoolean("drawOnscreenControls", getConfig("Dolphin.ini", "Android", "ScreenControls", "True").equals("True"));
 
 		editor.putString("internalResolution",     getConfig("gfx_opengl.ini", "Settings", "EFBScale", "2") );
@@ -120,6 +121,9 @@ public final class UserPreferences
 		// Current video backend being used. Falls back to software rendering upon error.
 		String currentVideoBackend = prefs.getString("gpuPref", "Software Rendering");
 
+		// Whether or not FPS will be displayed on-screen.
+		boolean showingFPS = prefs.getBoolean("showFPS", false);
+
 		// Whether or not to draw on-screen controls.
 		boolean drawingOnscreenControls = prefs.getBoolean("drawOnscreenControls", true);
 
@@ -172,6 +176,7 @@ public final class UserPreferences
 
 		// General Video Settings
 		NativeLibrary.SetConfig("Dolphin.ini", "Core", "GFXBackend", currentVideoBackend);
+		NativeLibrary.SetConfig("gfx_opengl.ini", "Settings", "ShowFPS", showingFPS ? "True" : "False");
 		NativeLibrary.SetConfig("Dolphin.ini", "Android", "ScreenControls", drawingOnscreenControls ? "True" : "False");
 
 		// Video Hack Settings