diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 11808ec879..34ee89a078 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -111,7 +111,7 @@ + android:resource="@mipmap/ic_launcher" /> diff --git a/android/build.gradle b/android/build.gradle index bbb8dde198..b5fc122301 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -48,7 +48,11 @@ android { compileSdk 35 ndkVersion "21.4.7075529" - + java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } + } defaultConfig { /* configurations.all { @@ -117,10 +121,14 @@ android { '../assets', ] } + normal { + res.srcDirs = ['normal/res'] + } gold { res.srcDirs = ['gold/res'] } vr { + res.srcDirs = ['normal/res'] manifest.srcFile 'VRManifest.xml' } legacy { diff --git a/android/d.txt b/android/d.txt deleted file mode 100644 index 4bcfe98e64..0000000000 --- a/android/d.txt +++ /dev/null @@ -1 +0,0 @@ -d diff --git a/android/gold/res/drawable-hdpi/ic_launcher.png b/android/gold/res/drawable-hdpi/ic_launcher.png deleted file mode 100644 index 6623629741..0000000000 Binary files a/android/gold/res/drawable-hdpi/ic_launcher.png and /dev/null differ diff --git a/android/gold/res/drawable-ldpi/ic_launcher.png b/android/gold/res/drawable-ldpi/ic_launcher.png deleted file mode 100644 index 2b6a409065..0000000000 Binary files a/android/gold/res/drawable-ldpi/ic_launcher.png and /dev/null differ diff --git a/android/gold/res/drawable-mdpi/ic_launcher.png b/android/gold/res/drawable-mdpi/ic_launcher.png deleted file mode 100644 index d2df261bab..0000000000 Binary files a/android/gold/res/drawable-mdpi/ic_launcher.png and /dev/null differ diff --git a/android/gold/res/drawable-xhdpi/ic_banner.png b/android/gold/res/drawable-xhdpi/ic_banner.png index aadda27f32..936edbcd6b 100644 Binary files a/android/gold/res/drawable-xhdpi/ic_banner.png and b/android/gold/res/drawable-xhdpi/ic_banner.png differ diff --git a/android/gold/res/drawable-xhdpi/ic_launcher.png b/android/gold/res/drawable-xhdpi/ic_launcher.png deleted file mode 100644 index c8e6e7d3d4..0000000000 Binary files a/android/gold/res/drawable-xhdpi/ic_launcher.png and /dev/null differ diff --git a/android/gold/res/drawable-xxhdpi/ic_launcher.png b/android/gold/res/drawable-xxhdpi/ic_launcher.png deleted file mode 100644 index f1d666718c..0000000000 Binary files a/android/gold/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/android/res/mipmap-anydpi-v26/ic_launcher.xml b/android/gold/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from android/res/mipmap-anydpi-v26/ic_launcher.xml rename to android/gold/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/android/gold/res/mipmap-hdpi/ic_launcher.png b/android/gold/res/mipmap-hdpi/ic_launcher.png index 6623629741..6adb7a5140 100644 Binary files a/android/gold/res/mipmap-hdpi/ic_launcher.png and b/android/gold/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/gold/res/mipmap-hdpi/ic_launcher_foreground.png b/android/gold/res/mipmap-hdpi/ic_launcher_foreground.png index ddd85887cd..7112364351 100644 Binary files a/android/gold/res/mipmap-hdpi/ic_launcher_foreground.png and b/android/gold/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/android/gold/res/mipmap-hdpi/ic_launcher_round.png b/android/gold/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000000..355fb97310 Binary files /dev/null and b/android/gold/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/android/gold/res/mipmap-mdpi/ic_launcher.png b/android/gold/res/mipmap-mdpi/ic_launcher.png index d2df261bab..07ef1f44fd 100644 Binary files a/android/gold/res/mipmap-mdpi/ic_launcher.png and b/android/gold/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/gold/res/mipmap-mdpi/ic_launcher_foreground.png b/android/gold/res/mipmap-mdpi/ic_launcher_foreground.png index da83c7f7aa..b4d4614206 100644 Binary files a/android/gold/res/mipmap-mdpi/ic_launcher_foreground.png and b/android/gold/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/android/gold/res/mipmap-mdpi/ic_launcher_round.png b/android/gold/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000000..9db2a471f0 Binary files /dev/null and b/android/gold/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/android/gold/res/mipmap-xhdpi/ic_launcher.png b/android/gold/res/mipmap-xhdpi/ic_launcher.png index c8e6e7d3d4..b90db5d063 100644 Binary files a/android/gold/res/mipmap-xhdpi/ic_launcher.png and b/android/gold/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/gold/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/gold/res/mipmap-xhdpi/ic_launcher_foreground.png index 1b164184ef..4d8035ae6c 100644 Binary files a/android/gold/res/mipmap-xhdpi/ic_launcher_foreground.png and b/android/gold/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/android/gold/res/mipmap-xhdpi/ic_launcher_round.png b/android/gold/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000000..be3423da4b Binary files /dev/null and b/android/gold/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/android/gold/res/mipmap-xxhdpi/ic_launcher.png b/android/gold/res/mipmap-xxhdpi/ic_launcher.png index f1d666718c..3f15e25516 100644 Binary files a/android/gold/res/mipmap-xxhdpi/ic_launcher.png and b/android/gold/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/gold/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/gold/res/mipmap-xxhdpi/ic_launcher_foreground.png index 9aad451c46..acfca1b1a7 100644 Binary files a/android/gold/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/android/gold/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/android/gold/res/mipmap-xxhdpi/ic_launcher_round.png b/android/gold/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000000..0013f53b63 Binary files /dev/null and b/android/gold/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/android/gold/res/mipmap-xxxhdpi/ic_launcher.png b/android/gold/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000000..f72cc6dd9a Binary files /dev/null and b/android/gold/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/gold/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/gold/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000000..ec9efd3da5 Binary files /dev/null and b/android/gold/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/android/gold/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/gold/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000000..6a2760d7f3 Binary files /dev/null and b/android/gold/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/android/gold/res/values/ic_launcher_background.xml b/android/gold/res/values/ic_launcher_background.xml index 41d3129698..af3eaffd89 100644 --- a/android/gold/res/values/ic_launcher_background.xml +++ b/android/gold/res/values/ic_launcher_background.xml @@ -1,4 +1,4 @@ - #53482D + #534820 \ No newline at end of file diff --git a/android/legacy/res/drawable-hdpi/ic_launcher.png b/android/legacy/res/drawable-hdpi/ic_launcher.png deleted file mode 100644 index 7a36832d0f..0000000000 Binary files a/android/legacy/res/drawable-hdpi/ic_launcher.png and /dev/null differ diff --git a/android/legacy/res/drawable-mdpi/ic_launcher.png b/android/legacy/res/drawable-mdpi/ic_launcher.png deleted file mode 100644 index ed83506c1b..0000000000 Binary files a/android/legacy/res/drawable-mdpi/ic_launcher.png and /dev/null differ diff --git a/android/legacy/res/drawable-xhdpi/ic_launcher.png b/android/legacy/res/drawable-xhdpi/ic_launcher.png deleted file mode 100644 index 4b7484924c..0000000000 Binary files a/android/legacy/res/drawable-xhdpi/ic_launcher.png and /dev/null differ diff --git a/android/legacy/res/drawable-xxhdpi/ic_launcher.png b/android/legacy/res/drawable-xxhdpi/ic_launcher.png deleted file mode 100644 index 895bba7f68..0000000000 Binary files a/android/legacy/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_banner.png b/android/normal/res/drawable-xhdpi/ic_banner.png similarity index 100% rename from android/res/drawable-xhdpi/ic_banner.png rename to android/normal/res/drawable-xhdpi/ic_banner.png diff --git a/android/normal/res/mipmap-anydpi-v26/ic_launcher.xml b/android/normal/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000000..036d09bc5f --- /dev/null +++ b/android/normal/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/android/normal/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/normal/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000000..036d09bc5f --- /dev/null +++ b/android/normal/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/android/normal/res/mipmap-hdpi/ic_launcher.png b/android/normal/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000000..eaee4ede0c Binary files /dev/null and b/android/normal/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/normal/res/mipmap-hdpi/ic_launcher_foreground.png b/android/normal/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000000..fedf484d46 Binary files /dev/null and b/android/normal/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/android/normal/res/mipmap-hdpi/ic_launcher_round.png b/android/normal/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000000..ebdb864f05 Binary files /dev/null and b/android/normal/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/android/normal/res/mipmap-mdpi/ic_launcher.png b/android/normal/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000000..93c8c8a38c Binary files /dev/null and b/android/normal/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/normal/res/mipmap-mdpi/ic_launcher_foreground.png b/android/normal/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000000..8fb9ddb9da Binary files /dev/null and b/android/normal/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/android/normal/res/mipmap-mdpi/ic_launcher_round.png b/android/normal/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000000..7acb40d473 Binary files /dev/null and b/android/normal/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/android/normal/res/mipmap-xhdpi/ic_launcher.png b/android/normal/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000000..f9be4ef41d Binary files /dev/null and b/android/normal/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/normal/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/normal/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000000..858b5129a8 Binary files /dev/null and b/android/normal/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/android/normal/res/mipmap-xhdpi/ic_launcher_round.png b/android/normal/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000000..6208a478af Binary files /dev/null and b/android/normal/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/android/normal/res/mipmap-xxhdpi/ic_launcher.png b/android/normal/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000000..f2ebb55a16 Binary files /dev/null and b/android/normal/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/normal/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/normal/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000000..508c08372e Binary files /dev/null and b/android/normal/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/android/normal/res/mipmap-xxhdpi/ic_launcher_round.png b/android/normal/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000000..b4a0ce6c20 Binary files /dev/null and b/android/normal/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/android/normal/res/mipmap-xxxhdpi/ic_launcher.png b/android/normal/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000000..97cb59b7d5 Binary files /dev/null and b/android/normal/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/normal/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/normal/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000000..dc27abeb64 Binary files /dev/null and b/android/normal/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/android/normal/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/normal/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000000..2a0afd6660 Binary files /dev/null and b/android/normal/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/android/res/values/ic_launcher_background.xml b/android/normal/res/values/ic_launcher_background.xml similarity index 100% rename from android/res/values/ic_launcher_background.xml rename to android/normal/res/values/ic_launcher_background.xml diff --git a/android/res/drawable-hdpi/ic_launcher.png b/android/res/drawable-hdpi/ic_launcher.png deleted file mode 100644 index 982b0e34bc..0000000000 Binary files a/android/res/drawable-hdpi/ic_launcher.png and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_launcher.png b/android/res/drawable-mdpi/ic_launcher.png deleted file mode 100644 index badd38dc06..0000000000 Binary files a/android/res/drawable-mdpi/ic_launcher.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_launcher.png b/android/res/drawable-xhdpi/ic_launcher.png deleted file mode 100644 index 33d7274e9f..0000000000 Binary files a/android/res/drawable-xhdpi/ic_launcher.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_launcher.png b/android/res/drawable-xxhdpi/ic_launcher.png deleted file mode 100644 index 79863e3706..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/android/res/mipmap-hdpi/ic_launcher.png b/android/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 982b0e34bc..0000000000 Binary files a/android/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/android/res/mipmap-hdpi/ic_launcher_foreground.png b/android/res/mipmap-hdpi/ic_launcher_foreground.png deleted file mode 100644 index dfd4b7ebad..0000000000 Binary files a/android/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/android/res/mipmap-mdpi/ic_launcher.png b/android/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index badd38dc06..0000000000 Binary files a/android/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/android/res/mipmap-mdpi/ic_launcher_foreground.png b/android/res/mipmap-mdpi/ic_launcher_foreground.png deleted file mode 100644 index 00db9645c0..0000000000 Binary files a/android/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/android/res/mipmap-xhdpi/ic_launcher.png b/android/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 33d7274e9f..0000000000 Binary files a/android/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/android/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/res/mipmap-xhdpi/ic_launcher_foreground.png deleted file mode 100644 index 1711f0f7b9..0000000000 Binary files a/android/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/android/res/mipmap-xxhdpi/ic_launcher.png b/android/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 79863e3706..0000000000 Binary files a/android/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/android/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/res/mipmap-xxhdpi/ic_launcher_foreground.png deleted file mode 100644 index b623f90e42..0000000000 Binary files a/android/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/android/res/values/analytics.xml b/android/res/values/analytics.xml deleted file mode 100644 index b8b5bb4c40..0000000000 --- a/android/res/values/analytics.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - UA-36039055-2 - - true - - true - diff --git a/android/src/gold/ic_launcher-playstore.png b/android/src/gold/ic_launcher-playstore.png new file mode 100644 index 0000000000..12a23edafb Binary files /dev/null and b/android/src/gold/ic_launcher-playstore.png differ diff --git a/android/src/normal/ic_launcher-playstore.png b/android/src/normal/ic_launcher-playstore.png new file mode 100644 index 0000000000..dd96d9be5e Binary files /dev/null and b/android/src/normal/ic_launcher-playstore.png differ diff --git a/android/src/org/ppsspp/ppsspp/ShortcutActivity.java b/android/src/org/ppsspp/ppsspp/ShortcutActivity.java index f7717f823a..8cd2945b21 100644 --- a/android/src/org/ppsspp/ppsspp/ShortcutActivity.java +++ b/android/src/org/ppsspp/ppsspp/ShortcutActivity.java @@ -154,7 +154,7 @@ public class ShortcutActivity extends Activity { } if (!setIcon) { // Fall back to the PPSSPP icon. - ShortcutIconResource iconResource = ShortcutIconResource.fromContext(this, R.drawable.ic_launcher); + ShortcutIconResource iconResource = ShortcutIconResource.fromContext(this, R.mipmap.ic_launcher); responseIntent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, iconResource); } setResult(RESULT_OK, responseIntent);