From 1b99233466ccbf0271676b0ab3637268d6cece23 Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Tue, 29 Dec 2020 19:26:11 +1000
Subject: [PATCH] Android: Add analog-stick-as-dpad option to controller
 settings

---
 android/app/src/main/res/values/strings.xml              | 3 +++
 android/app/src/main/res/xml/controllers_preferences.xml | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 6b773740d..f381af3c0 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -177,4 +177,7 @@
     <string name="controller_mapping_activity_failed_to_save_input_profile">Failed to save input profile.</string>
     <string name="controller_mapping_activity_input_profile_saved">Input profile \'%s\' saved.</string>
     <string name="controller_mapping_activity_cancel">Cancel</string>
+    <string name="settings_use_analog_sticks_for_dpad">Use Analog Sticks for D-Pad in Digital Mode</string>
+    <string name="settings_summary_enable_analog_mode_on_reset">Forces the controller to analog mode when the console is reset/powered on.</string>
+    <string name="settings_summary_use_analog_sticks_for_dpad">Allows you to use the analog sticks to control the d-pad in digital mode, as well as the buttons.</string>
 </resources>
diff --git a/android/app/src/main/res/xml/controllers_preferences.xml b/android/app/src/main/res/xml/controllers_preferences.xml
index 7f5407222..18d107d37 100644
--- a/android/app/src/main/res/xml/controllers_preferences.xml
+++ b/android/app/src/main/res/xml/controllers_preferences.xml
@@ -36,6 +36,13 @@
     <SwitchPreferenceCompat
         app:key="Controller1/ForceAnalogOnReset"
         app:title="@string/settings_enable_analog_mode_on_reset"
+        app:summary="@string/settings_summary_enable_analog_mode_on_reset"
+        app:defaultValue="true"
+        app:iconSpaceReserved="false" />
+    <SwitchPreferenceCompat
+        app:key="Controller1/"
+        app:title="@string/settings_use_analog_sticks_for_dpad"
+        app:summary="@string/settings_summary_use_analog_sticks_for_dpad"
         app:defaultValue="true"
         app:iconSpaceReserved="false" />
     <ListPreference