New icon images, reorganize files, update banner

android/AndroidManifest.xml

@@ -111,7 +111,7 @@
 
         <meta-data
             android:name="xperiaplayoptimized_content"
-            android:resource="@drawable/ic_launcher" />
+            android:resource="@mipmap/ic_launcher" />
 
         <profileable android:shell="true" android:enabled="true" />
     </application>

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 {

android/d.txt

@@ -1 +0,0 @@
-d

android/gold/res/values/ic_launcher_background.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#53482D</color>
+    <color name="ic_launcher_background">#534820</color>
 </resources>

android/normal/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

android/normal/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

android/res/values/analytics.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <string name="ga_trackingId">UA-36039055-2</string>
-  <!--Enable automatic activity tracking-->
-  <bool name="ga_autoActivityTracking">true</bool>
-  <!--Enable automatic exception tracking-->
-  <bool name="ga_reportUncaughtExceptions">true</bool>
-</resources>

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);