From 0c993ad4a9f153531e544e4fab2fc9e0ea4311da Mon Sep 17 00:00:00 2001
From: sigmabeta <sigmabeta@users.noreply.github.com>
Date: Tue, 16 Jun 2015 15:42:11 -0400
Subject: [PATCH] Android: Fix a bug making Input Overlay config screen only
 work in release OR debug builds, but not in both.

---
 Source/Android/app/build.gradle                     | 2 ++
 Source/Android/app/src/debug/res/values/strings.xml | 4 ++++
 Source/Android/app/src/main/res/values/strings.xml  | 3 +++
 Source/Android/app/src/main/res/xml/preferences.xml | 2 +-
 4 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 Source/Android/app/src/debug/res/values/strings.xml

diff --git a/Source/Android/app/build.gradle b/Source/Android/app/build.gradle
index 6c1a46a914..1fe1039f89 100644
--- a/Source/Android/app/build.gradle
+++ b/Source/Android/app/build.gradle
@@ -11,6 +11,7 @@ android {
     }
 
     defaultConfig {
+        // TODO If this is ever modified, change application_id in strings.xml
         applicationId "org.dolphinemu.dolphinemu"
         minSdkVersion 21
         targetSdkVersion 21
@@ -43,6 +44,7 @@ android {
         // Signed by debug key disallowing distribution on Play Store.
         // Attaches 'debug' suffix to version and package name, allowing installation alongside the release build.
         debug {
+            // TODO If this is ever modified, change application_id in debug/strings.xml
             applicationIdSuffix ".debug"
             versionNameSuffix '-debug'
             jniDebuggable true
diff --git a/Source/Android/app/src/debug/res/values/strings.xml b/Source/Android/app/src/debug/res/values/strings.xml
new file mode 100644
index 0000000000..8048c21d75
--- /dev/null
+++ b/Source/Android/app/src/debug/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="application_id">org.dolphinemu.dolphinemu.debug</string>
+</resources>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml
index e01c06da3a..df9020e44f 100644
--- a/Source/Android/app/src/main/res/values/strings.xml
+++ b/Source/Android/app/src/main/res/values/strings.xml
@@ -240,4 +240,7 @@
     <string name="emulation_title">Emulation Activity</string>
 
     <string name="emulation_toggle_input">Toggle Input Overlay</string>
+
+    <!-- Package Names-->
+    <string name="application_id">org.dolphinemu.dolphinemu</string>
 </resources>
diff --git a/Source/Android/app/src/main/res/xml/preferences.xml b/Source/Android/app/src/main/res/xml/preferences.xml
index e275107c7b..c91f77ab96 100644
--- a/Source/Android/app/src/main/res/xml/preferences.xml
+++ b/Source/Android/app/src/main/res/xml/preferences.xml
@@ -43,7 +43,7 @@
 
                 <intent
                     android:targetClass="org.dolphinemu.dolphinemu.activities.OverlayConfigActivity"
-                    android:targetPackage="org.dolphinemu.dolphinemu.debug"/>
+                    android:targetPackage="@string/application_id"/>
 
             </Preference>