Merge pull request #6583 from kevlahnota/master2

try to optout on Edge-to-Edge for android 15
Card-Forge · Nov 17, 2024 · f6d4e32 · f6d4e32
2 parents c603bfb + cca1468
commit f6d4e32
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/forge-gui-android/res/values-v35/styles.xml b/forge-gui-android/res/values-v35/styles.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<resources>
+    <style name="NormalTheme" parent="@android:style/Theme.NoTitleBar.Fullscreen">
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
+    </style>
+</resources>
diff --git a/forge-gui-android/res/values/styles.xml b/forge-gui-android/res/values/styles.xml
@@ -7,5 +7,10 @@
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowIsFloating">true</item>
         <item name="android:backgroundDimEnabled">false</item>
+        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
+    </style>
+    <style name="NormalTheme" parent="@android:style/Theme.NoTitleBar.Fullscreen">
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
     </style>
 </resources>
diff --git a/forge-gui-android/src/forge/app/Main.java b/forge-gui-android/src/forge/app/Main.java
@@ -432,8 +432,7 @@ private void initForge(AndroidAdapter adapter, boolean permissiongranted, int to
         config.useCompass = false;
         config.useGyroscope = false;
         config.useRotationVectorSensor = false;
-        // try to use immersive mode on android 13 and above
-        config.useImmersiveMode = Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU;
+        config.useImmersiveMode = false;
         config.nativeLoader = () -> ReLinker.loadLibrary(getContext(), "gdx");
 
         if (!Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) {

diff --git a/forge-gui-android/src/main/AndroidManifest.xml b/forge-gui-android/src/main/AndroidManifest.xml
@@ -58,7 +58,7 @@
             android:label="@string/app_name"
             android:configChanges="density|fontScale|keyboard|keyboardHidden|layoutDirection|locale|mcc|mnc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|touchscreen|uiMode"
             android:launchMode="singleInstance"
-            android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+            android:theme="@style/NormalTheme"
             android:exported="false">
         </activity>
         <meta-data android:name="io.sentry.dsn" android:value="https://a0b8dbad9b8a49cfa51bf65d462e8dae:[email protected]/2?buffer.enabled=false" />