From 801af3be81a9ca9964cb2b4313fe5a2d3db2e7f0 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Mon, 4 Nov 2013 11:19:50 -0500
Subject: [PATCH] [Android] Add rewinding granularity to the general settings.

---
 android/phoenix/res/values/strings.xml                      | 2 ++
 android/phoenix/res/xml/general_preferences.xml             | 6 ++++++
 .../retroarch/browser/preferences/util/UserPreferences.java | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/android/phoenix/res/values/strings.xml b/android/phoenix/res/values/strings.xml
index ffa7bba72c..3492442bb7 100644
--- a/android/phoenix/res/values/strings.xml
+++ b/android/phoenix/res/values/strings.xml
@@ -171,6 +171,8 @@
     <string name="auto_save_state_desc">Automatically saves state (*.state.auto) when exiting game.</string>
     <string name="rewinding">Rewinding</string>
     <string name="rewinding_desc">Enable real-time rewinding of gameplay. (WARNING: Very CPU intensive - will decrease ingame performance by a lot - only use this option on a powerful device).</string>
+    <string name="rewind_granularity">Rewind Granularity</string>
+    <string name="rewind_granularity_desc">Number of frames to rewind at a time.</string>
 
     <!-- Video Settings -->
     <string name="video_options">Video</string>
diff --git a/android/phoenix/res/xml/general_preferences.xml b/android/phoenix/res/xml/general_preferences.xml
index a2bd6c60f6..3685aeb6b1 100644
--- a/android/phoenix/res/xml/general_preferences.xml
+++ b/android/phoenix/res/xml/general_preferences.xml
@@ -41,5 +41,11 @@
             android:key="rewind_enable"
             android:summary="@string/rewinding_desc"
             android:title="@string/enable" />
+        <EditTextPreference
+            android:dependency="rewind_enable"
+            android:key="rewind_granularity"
+            android:numeric="integer"
+            android:summary="@string/rewind_granularity_desc"
+            android:title="@string/rewind_granularity"/>
     </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/android/phoenix/src/com/retroarch/browser/preferences/util/UserPreferences.java b/android/phoenix/src/com/retroarch/browser/preferences/util/UserPreferences.java
index 451598ded3..e74c8da826 100644
--- a/android/phoenix/src/com/retroarch/browser/preferences/util/UserPreferences.java
+++ b/android/phoenix/src/com/retroarch/browser/preferences/util/UserPreferences.java
@@ -110,6 +110,7 @@ public final class UserPreferences
 
 		// General Settings
 		readbackBool(config, edit, "rewind_enable");
+		readbackString(config, edit, "rewind_granularity");
 		readbackBool(config, edit, "savestate_auto_load");
 		readbackBool(config, edit, "savestate_auto_save");
 
@@ -202,6 +203,7 @@ public final class UserPreferences
 		config.setBoolean("savestate_auto_load", prefs.getBoolean("savestate_auto_load", true));
 		config.setBoolean("savestate_auto_save", prefs.getBoolean("savestate_auto_save", false));
 		config.setBoolean("rewind_enable", prefs.getBoolean("rewind_enable", false));
+		config.setInt("rewind_granularity", Integer.parseInt(prefs.getString("rewind_granularity", "1")));
 		config.setBoolean("video_vsync", prefs.getBoolean("video_vsync", true));
 		config.setBoolean("input_autodetect_enable", prefs.getBoolean("input_autodetect_enable", true));
 		config.setBoolean("input_debug_enable", prefs.getBoolean("input_debug_enable", false));