Merge pull request #1908 from Sonicadvance1/Android_aspect_ratio

[Android] Expose aspect ratio to the video settings.

4 files changed, 29 insertions, 0 deletions

diff --git a/Source/Android/res/values/arrays.xml b/Source/Android/res/values/arrays.xml
index 0c0a60d8d8..0ea284c71e 100644
--- a/Source/Android/res/values/arrays.xml
+++ b/Source/Android/res/values/arrays.xml
@@ -169,4 +169,18 @@
         <item>2</item>
         <item>3</item>
     </string-array>
+
+    <!-- Aspect Ratio Preference -->
+    <string-array name="aspectRatioEntries" translatable="false">
+        <item>Auto</item>
+        <item>Force 16:9</item>
+        <item>Force 4:3</item>
+        <item>Stretch To Window</item>
+    </string-array>
+    <string-array name="aspectRatioValues" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+    </string-array>
 </resources>
diff --git a/Source/Android/res/values/strings.xml b/Source/Android/res/values/strings.xml
index d4b5921c5e..f321d08df2 100644
--- a/Source/Android/res/values/strings.xml
+++ b/Source/Android/res/values/strings.xml
@@ -210,6 +210,8 @@
     <string name="disable_destination_alpha_descrip">Disables emulation of a hardware feature called destination alpha, which is used in many games for various effects.</string>
     <string name="fast_depth_calculation">Fast Depth Calculation</string>
     <string name="fast_depth_calculation_descrip">Uses a less accurate algorithm to calculate depth values.</string>
+    <string name="aspect_ratio">Aspect Ratio</string>
+    <string name="aspect_ratio_descrip">Select what aspect ratio to use when rendering</string>
 
     <!-- Miscellaneous -->
     <string name="yes">Yes</string>
diff --git a/Source/Android/res/xml/video_prefs.xml b/Source/Android/res/xml/video_prefs.xml
index 9ace18dd4e..57c02e5944 100644
--- a/Source/Android/res/xml/video_prefs.xml
+++ b/Source/Android/res/xml/video_prefs.xml
@@ -155,6 +155,14 @@
                 android:summary="@string/fast_depth_calculation_descrip"
                 android:title="@string/fast_depth_calculation"/>
 
+            <ListPreference
+                android:defaultValue="0"
+                android:entries="@array/aspectRatioEntries"
+                android:entryValues="@array/aspectRatioValues"
+                android:key="aspectRatio"
+                android:summary="@string/aspect_ratio_descrip"
+                android:title="@string/aspect_ratio"/>
+
         </PreferenceCategory>
     </PreferenceScreen>
 
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java
index 710ebca7ee..1cfeb5cbae 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java
@@ -103,6 +103,7 @@ public final class UserPreferences
 
 		editor.putBoolean("disableDestinationAlpha", getConfig("gfx_opengl.ini", "Settings", "DstAlphaPass", "False").equals("True"));
 		editor.putBoolean("fastDepthCalculation",    getConfig("gfx_opengl.ini", "Settings", "FastDepthCalc", "True").equals("True"));
+		editor.putString("aspectRatio", getConfig("gfx_opengl.ini", "Settings", "AspectRatio", "0"));
 
 		// Apply the changes.
 		editor.apply();
@@ -162,6 +163,9 @@ public final class UserPreferences
 		// Whether or not to use fast depth calculation.
 		boolean useFastDepthCalc = prefs.getBoolean("fastDepthCalculation", true);
 
+		// Aspect ratio selection
+		String aspectRatio = prefs.getString("aspectRatio", "0");
+
 		// Internal resolution. Falls back to 1x Native upon error.
 		String internalResolution = prefs.getString("internalResolution", "2");
 
@@ -211,6 +215,7 @@ public final class UserPreferences
 		// Video Hack Settings
 		NativeLibrary.SetConfig("gfx_opengl.ini", "Hacks", "EFBAccessEnable", skipEFBAccess ? "False" : "True");
 		NativeLibrary.SetConfig("gfx_opengl.ini", "Hacks", "EFBEmulateFormatChanges", ignoreFormatChanges ? "True" : "False");
+		NativeLibrary.SetConfig("gfx_opengl.ini", "Settings", "AspectRatio", aspectRatio);
 
 		// Set EFB Copy Method 
 		if (efbCopyMethod.equals("Off"))