From 5cd22f6bcd70e3235da50b8242b25c2e27047f8f Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Sun, 31 Aug 2025 15:04:55 -0400
Subject: [PATCH] v3.2.3: various further Android-specific UI/layout
 improvements

---
 android/src/main/AndroidManifest.xml          |  7 +--
 .../android/AndroidPlatformSupport.java       | 43 +++++++++++--------
 android/src/main/res/values-v28/style.xml     |  9 ++++
 android/src/main/res/values/style.xml         |  8 ++--
 4 files changed, 38 insertions(+), 29 deletions(-)
 create mode 100644 android/src/main/res/values-v28/style.xml

diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index 3a9e0b556..cdbcc0c82 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
     android:installLocation="auto"
-	android:targetSandboxVersion="2"
-	xmlns:dist="http://schemas.android.com/apk/distribution">
+	android:targetSandboxVersion="2">
 
-	<dist:module dist:instant="true" />
 	<uses-feature android:glEsVersion="0x00020000"/>
 
 	<uses-permission android:name="android.permission.VIBRATE" />
@@ -22,7 +19,7 @@
 	<application
 		android:icon="@mipmap/ic_launcher"
 		android:label="${appName}"
-		android:theme="@style/Theme"
+		android:theme="@style/GameTheme"
 		android:appCategory="game"
 		android:isGame="true"
 		android:resizeableActivity="true"
diff --git a/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidPlatformSupport.java b/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidPlatformSupport.java
index 3159d9642..2af7888d8 100644
--- a/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidPlatformSupport.java
+++ b/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidPlatformSupport.java
@@ -21,9 +21,9 @@
 
 package com.shatteredpixel.shatteredpixeldungeon.android;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.pm.ActivityInfo;
+import android.graphics.Rect;
 import android.net.ConnectivityManager;
 import android.os.Build;
 import android.view.DisplayCutout;
@@ -36,6 +36,8 @@ import com.badlogic.gdx.graphics.Pixmap;
 import com.badlogic.gdx.graphics.g2d.PixmapPacker;
 import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator;
 import com.shatteredpixel.shatteredpixeldungeon.SPDSettings;
+import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
+import com.watabou.noosa.Game;
 import com.watabou.utils.PlatformSupport;
 import com.watabou.utils.RectF;
 
@@ -50,9 +52,7 @@ public class AndroidPlatformSupport extends PlatformSupport {
 				ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE :
 				ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED );
 
-		//TODO seem to be existing bugs with handling split screen here, should look into that
-
-		//TODO display isn't refreshing when fullscreen toggled on/off, or on 180 degree rotate
+		ShatteredPixelDungeon.seamlessResetScene();
 	}
 
 	public boolean supportsFullScreen(){
@@ -69,7 +69,9 @@ public class AndroidPlatformSupport extends PlatformSupport {
 	public RectF getSafeInsets( int level ) {
 		RectF insets = new RectF();
 
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+		//getting insets technically works down to 6.0 Marshmallow, but we let the device handle all of that prior to 9.0 Pie
+		//TODO test on Android P emulator!
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && !AndroidLauncher.instance.isInMultiWindowMode()) {
 			WindowInsets rootInsets = AndroidLauncher.instance.getApplicationWindow().getDecorView().getRootWindowInsets();
 			if (rootInsets != null) {
 
@@ -82,21 +84,25 @@ public class AndroidPlatformSupport extends PlatformSupport {
 				}
 
 				//display cutout
-				if (level > INSET_BLK && Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+				if (level > INSET_BLK) {
 					DisplayCutout cutout = rootInsets.getDisplayCutout();
-					//TODO determine if a cutout is large or not based on its size in pixels:
-					// on my OP7P, dev mode not simulations are:
-					//top-left cutout is 0,0,136,136 (136x136 = 18.5k total)
-					//center is 552,0,888,168 (336*168 = 56k total)
-					//top-right corner is 1272,0,1440,168 (x168 = 28k total)
-					//overall screen is 1440x3120 = 4400k pixels
-					// 0.5% of 4400k is 22k
-					//maybe judge a cutout to be large if it's bigger than 0.5% of the display?
+
 					if (cutout != null) {
-						insets.left = Math.max(insets.left, cutout.getSafeInsetLeft());
-						insets.top = Math.max(insets.top, cutout.getSafeInsetTop());
-						insets.right = Math.max(insets.right, cutout.getSafeInsetRight());
-						insets.bottom = Math.max(insets.bottom, cutout.getSafeInsetBottom());
+						boolean largeCutout = false;
+						int screenSize = Game.width * Game.height;
+						for (Rect r : cutout.getBoundingRects()){
+							int cutoutSize = Math.abs(r.height() * r.width());
+							//display cutouts are considered large if they take up more than 0.5% of the screen
+							if (cutoutSize*200 >= screenSize){
+								largeCutout = true;
+							}
+						}
+						if (largeCutout || level == INSET_ALL) {
+							insets.left = Math.max(insets.left, cutout.getSafeInsetLeft());
+							insets.top = Math.max(insets.top, cutout.getSafeInsetTop());
+							insets.right = Math.max(insets.right, cutout.getSafeInsetRight());
+							insets.bottom = Math.max(insets.bottom, cutout.getSafeInsetBottom());
+						}
 					}
 				}
 			}
@@ -107,7 +113,6 @@ public class AndroidPlatformSupport extends PlatformSupport {
 	public void updateSystemUI() {
 		
 		AndroidLauncher.instance.runOnUiThread(new Runnable() {
-			@SuppressLint("NewApi")
 			@Override
 			public void run() {
 				boolean fullscreen = Build.VERSION.SDK_INT < Build.VERSION_CODES.N
diff --git a/android/src/main/res/values-v28/style.xml b/android/src/main/res/values-v28/style.xml
new file mode 100644
index 000000000..01e8bb7f8
--- /dev/null
+++ b/android/src/main/res/values-v28/style.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Newer Material translucent theme for Android 9+ that lets them go true fullscreen -->
+    <style name="GameTheme" parent="@android:style/Theme.Material.NoActionBar.TranslucentDecor">
+        <item name="android:windowLayoutInDisplayCutoutMode">
+            always <!-- For Android 14- devices, edge-to-edge is automatic for Android 15+ -->
+        </item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/android/src/main/res/values/style.xml b/android/src/main/res/values/style.xml
index 195bf28c8..249a143f0 100644
--- a/android/src/main/res/values/style.xml
+++ b/android/src/main/res/values/style.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="Theme" parent="@android:style/Theme.Black.NoTitleBar">
-        <item name="android:windowLayoutInDisplayCutoutMode">
-            always <!-- For Android 14 and older devices-->
-        </item>
-    </style>
+    <!-- Compat with Android 8 and older, which don't have full inset handling support -->
+    <!-- This is the classic plain black theme that Pixel Dungeons have always used -->
+    <style name="GameTheme" parent="@android:style/Theme.Black.NoTitleBar"/>
 </resources>