ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Android: Fix a bug making Input Overlay config screen only work in release OR debug builds, but not in both.

This commit is contained in:
sigmabeta 2015-06-16 15:42:11 -04:00
parent 82dea170cf
commit 0c993ad4a9
4 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Android/app/build.gradle
View File

@ -11,6 +11,7 @@ android {
} }
defaultConfig { defaultConfig {
// TODO If this is ever modified, change application_id in strings.xml
applicationId "org.dolphinemu.dolphinemu" applicationId "org.dolphinemu.dolphinemu"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 21 targetSdkVersion 21
@ -43,6 +44,7 @@ android {
// Signed by debug key disallowing distribution on Play Store. // Signed by debug key disallowing distribution on Play Store.
// Attaches 'debug' suffix to version and package name, allowing installation alongside the release build. // Attaches 'debug' suffix to version and package name, allowing installation alongside the release build.
debug { debug {
// TODO If this is ever modified, change application_id in debug/strings.xml
applicationIdSuffix ".debug" applicationIdSuffix ".debug"
versionNameSuffix '-debug' versionNameSuffix '-debug'
jniDebuggable true jniDebuggable true

4
Source/Android/app/src/debug/res/values/strings.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="application_id">org.dolphinemu.dolphinemu.debug</string>
</resources>

3
Source/Android/app/src/main/res/values/strings.xml
View File

@ -240,4 +240,7 @@
<string name="emulation_title">Emulation Activity</string> <string name="emulation_title">Emulation Activity</string>
<string name="emulation_toggle_input">Toggle Input Overlay</string> <string name="emulation_toggle_input">Toggle Input Overlay</string>
<!-- Package Names-->
<string name="application_id">org.dolphinemu.dolphinemu</string>
</resources> </resources>

2
Source/Android/app/src/main/res/xml/preferences.xml
View File

@ -43,7 +43,7 @@
<intent <intent
android:targetClass="org.dolphinemu.dolphinemu.activities.OverlayConfigActivity" android:targetClass="org.dolphinemu.dolphinemu.activities.OverlayConfigActivity"
android:targetPackage="org.dolphinemu.dolphinemu.debug"/> android:targetPackage="@string/application_id"/>
</Preference> </Preference>