piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 13:27:45 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Android: Give Debug and Benchmark builds unique names

Browse Source 
on the launcher and for the DocumentsProvider
This commit is contained in:
Robin Kertels 2023-04-08 14:54:49 +02:00
parent d5b811dd7f
commit 1596b13743
No known key found for this signature in database
GPG Key ID: 3824904F14D40757
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,6 @@ android {
}
defaultConfig {
// TODO If this is ever modified, change application_id in strings.xml
applicationId "org.dolphinemu.dolphinemu"
minSdkVersion 21
targetSdkVersion 33
@ -74,6 +73,7 @@ android {
signingConfig signingConfigs.release
}
resValue 'string', 'app_name_suffixed', 'Dolphin Emulator'
minifyEnabled true
shrinkResources true
proguardFiles getDefaultProguardFile(
@ -86,13 +86,14 @@ 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
resValue 'string', 'app_name_suffixed', 'Dolphin Debug'
applicationIdSuffix ".debug"
versionNameSuffix '-debug'
jniDebuggable true
}
benchmark {
resValue 'string', 'app_name_suffixed', 'Dolphin Benchmark'
signingConfig signingConfigs.debug
matchingFallbacks = ['release']
debuggable false

4
Source/Android/app/src/main/AndroidManifest.xml
View File

@ -31,7 +31,7 @@
<application
android:name=".DolphinApplication"
android:label="@string/app_name"
android:label="@string/app_name_suffixed"
android:icon="@mipmap/ic_launcher"
android:requestLegacyExternalStorage="true"
android:preserveLegacyExternalStorage="true"
@ -97,7 +97,7 @@
<activity
android:name=".activities.CustomFilePickerActivity"
android:exported="false"
android:label="@string/app_name"
android:label="@string/app_name_suffixed"
android:theme="@style/Theme.Dolphin.FilePicker">
<intent-filter>

4
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/DocumentProvider.kt
View File

@ -59,7 +59,7 @@ class DocumentProvider : DocumentsProvider() {
result.newRow().apply {
add(DocumentsContract.Root.COLUMN_ROOT_ID, ROOT_ID)
add(DocumentsContract.Root.COLUMN_TITLE, context!!.getString(R.string.app_name))
add(DocumentsContract.Root.COLUMN_TITLE, context!!.getString(R.string.app_name_suffixed))
add(DocumentsContract.Root.COLUMN_ICON, R.drawable.ic_dolphin)
add(
DocumentsContract.Root.COLUMN_FLAGS,
@ -171,7 +171,7 @@ class DocumentProvider : DocumentsProvider() {
}
val name = if (file == rootDirectory) {
context!!.getString(R.string.app_name)
context!!.getString(R.string.app_name_suffixed)
} else {
file.name
}

1
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java
View File

@ -77,6 +77,7 @@ public final class MainActivity extends AppCompatActivity
setInsets();
ThemeHelper.enableStatusBarScrollTint(this, mBinding.appbarMain);
mBinding.toolbarMain.setTitle(R.string.app_name);
setSupportActionBar(mBinding.toolbarMain);
// Set up the FAB.