Enable android cutout mode in axmol engine (#3115)

halx99 · web-flow · commit 952759b75f92 · 2026-04-10T19:15:00.000+08:00
diff --git a/axmol/platform/android/java/res/.gitignore b/axmol/platform/android/java/res/.gitignore
diff --git a/axmol/platform/android/java/src/dev/axmol/lib/AxmolActivity.java b/axmol/platform/android/java/src/dev/axmol/lib/AxmolActivity.java
@@ -151,8 +151,19 @@ protected void onCreate(final Bundle savedInstanceState) {
             return;
         }
 
+        Window window = this.getWindow();
+        // Enable rendering into the cutout area
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            WindowManager.LayoutParams lp = window.getAttributes();
+            lp.layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
+            window.setAttributes(lp);
+        }
+
         this.hideVirtualButton();
 
+        // Input mode
+        window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
+
         onLoadNativeLibraries();
 
         sContext = this;
@@ -163,9 +174,6 @@ protected void onCreate(final Bundle savedInstanceState) {
         mPlayer = new AxmolPlayer(this);
         setContentView(mPlayer);
 
-        Window window = this.getWindow();
-        window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
-
         // Audio configuration
         this.setVolumeControlStream(AudioManager.STREAM_MUSIC);
     }
diff --git a/axmol/platform/android/java/src/dev/axmol/lib/AxmolEngine.java b/axmol/platform/android/java/src/dev/axmol/lib/AxmolEngine.java
@@ -143,6 +143,7 @@ public void run() {
     public static void init(final AppCompatActivity activity) {
         sActivity = activity;
         AxmolEngine.sAxmolEngineListener = (AxmolEngineListener)activity;
+
         if (!sInited) {
 
             PackageManager pm = activity.getPackageManager();
@@ -634,8 +635,9 @@ public static boolean isCutoutEnabled() {
     public static int[] getSafeInsets() {
         final int[] safeInsets = new int[]{0, 0, 0, 0};
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            Window cocosWindow = sActivity.getWindow();
-            DisplayCutout displayCutout = cocosWindow.getDecorView().getRootWindowInsets().getDisplayCutout();
+            Window window = sActivity.getWindow();
+            WindowInsets rootWindowInsets = window.getDecorView().getRootWindowInsets();
+            DisplayCutout displayCutout = rootWindowInsets != null ? rootWindowInsets.getDisplayCutout() : null;
             // Judge whether it is cutouts (aka notch) screen phone by judge cutout equle to null
             if (displayCutout != null) {
                 List<Rect> rects = displayCutout.getBoundingRects();
@@ -661,9 +663,10 @@ public static int[] getSafeInsets() {
     public static int[] getDeviceCornerRadii() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
             final int[] radii = new int[]{0, 0, 0, 0};
-            Window cocosWindow = sActivity.getWindow();
-            View view = cocosWindow.getDecorView();
+            Window window = sActivity.getWindow();
+            View view = window.getDecorView();
             WindowInsets insets = view.getRootWindowInsets();
+            if (insets == null) return radii;
             android.view.RoundedCorner topLeft = insets.getRoundedCorner(android.view.RoundedCorner.POSITION_TOP_LEFT);
             android.view.RoundedCorner topRight = insets.getRoundedCorner(android.view.RoundedCorner.POSITION_TOP_RIGHT);
             android.view.RoundedCorner bottomLeft = insets.getRoundedCorner(android.view.RoundedCorner.POSITION_BOTTOM_LEFT);
diff --git a/axmol/platform/android/libaxmol-with-controller/build.gradle b/axmol/platform/android/libaxmol-with-controller/build.gradle
@@ -14,6 +14,7 @@ android {
     sourceSets.main {
         aidl.srcDir "../java/src"
         java.srcDirs = ['../java/src','../ControllerManualAdapter/src']
+        res.srcDir "../res"
         manifest.srcFile "AndroidManifest.xml"
     }
 
diff --git a/axmol/platform/android/libaxmol/build.gradle b/axmol/platform/android/libaxmol/build.gradle
@@ -19,6 +19,7 @@ android {
     sourceSets.main {
         aidl.srcDir "../java/src"
         java.srcDir "../java/src"
+        res.srcDir "../res"
         manifest.srcFile "AndroidManifest.xml"
     }
 
diff --git a/axmol/platform/android/res/values/styles.xml b/axmol/platform/android/res/values/styles.xml
@@ -0,0 +1,13 @@
+<resources>
+    <style name="AxmolTheme.Fullscreen" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+    </style>
+    <style name="AxmolTheme.Dark.Fullscreen" parent="AxmolTheme.Fullscreen">
+        <item name="android:windowBackground">@android:color/black</item>
+    </style>
+    <style name="AxmolTheme.Light.Fullscreen" parent="AxmolTheme.Fullscreen">
+        <item name="android:windowBackground">@android:color/white</item>
+    </style>
+</resources>
diff --git a/templates/common/proj.android/app/AndroidManifest.xml b/templates/common/proj.android/app/AndroidManifest.xml
@@ -18,7 +18,7 @@
             android:screenOrientation="sensorLandscape"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/app_name"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+            android:theme="@style/AxmolTheme.Light.Fullscreen"
             android:launchMode="singleTask"
             android:taskAffinity=""
             android:exported="true"  >
diff --git a/tests/cpp-tests/proj.android/app/AndroidManifest.xml b/tests/cpp-tests/proj.android/app/AndroidManifest.xml
@@ -21,10 +21,11 @@
             android:screenOrientation="fullSensor"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/app_name"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+            android:theme="@style/AxmolTheme.Light.Fullscreen"
             android:launchMode="singleTask"
             android:taskAffinity=""
-            android:exported="true"  >
+            android:exported="true"
+            android:resizeableActivity="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/tests/fairygui-tests/proj.android/app/AndroidManifest.xml b/tests/fairygui-tests/proj.android/app/AndroidManifest.xml
@@ -19,7 +19,7 @@
             android:screenOrientation="sensorLandscape"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/app_name"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+            android:theme="@style/AxmolTheme.Light.Fullscreen"
             android:launchMode="singleTask"
             android:taskAffinity=""
             android:exported="true"  >
diff --git a/tests/live2d-tests/proj.android/app/AndroidManifest.xml b/tests/live2d-tests/proj.android/app/AndroidManifest.xml
@@ -20,7 +20,7 @@
             android:screenOrientation="sensorLandscape"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/app_name"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+            android:theme="@style/AxmolTheme.Light.Fullscreen"
             android:launchMode="singleTask"
             android:taskAffinity=""
             android:exported="true"  >
diff --git a/tests/live2d-tests/proj.android/app/src/dev/axmol/cpp/AppActivity.java b/tests/live2d-tests/proj.android/app/src/dev/axmol/cpp/AppActivity.java
@@ -50,13 +50,6 @@ protected void onCreate(Bundle savedInstanceState) {
             // Don't need to finish it again since it's finished in super.onCreate .
             return;
         }
-        // Make sure we're running on Pie or higher to change cutout mode
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            // Enable rendering into the cutout area
-            WindowManager.LayoutParams lp = getWindow().getAttributes();
-            lp.layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
-            getWindow().setAttributes(lp);
-        }
         // DO OTHER INITIALIZATION BELOW
 
     }
diff --git a/tests/lua-tests/proj.android/app/AndroidManifest.xml b/tests/lua-tests/proj.android/app/AndroidManifest.xml
@@ -21,7 +21,7 @@
             android:screenOrientation="sensorLandscape"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/app_name"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+            android:theme="@style/AxmolTheme.Light.Fullscreen"
             android:launchMode="singleTask"
             android:taskAffinity=""
             android:exported="true"  >
diff --git a/tests/lua-tests/proj.android/app/src/dev/axmol/lua_tests/AppActivity.java b/tests/lua-tests/proj.android/app/src/dev/axmol/lua_tests/AppActivity.java
@@ -52,13 +52,4 @@ protected void onCreate(Bundle savedInstanceState) {
         // DO OTHER INITIALIZATION BELOW
 
     }
-
-    @Override
-    public AxmolGLSurfaceView onCreateView() {
-        AxmolGLSurfaceView glSurfaceView = new AxmolGLSurfaceView(this);
-        // Tests should create stencil buffer
-        glSurfaceView.setEGLConfigChooser(5, 6, 5, 0, 16, 8);
-
-        return glSurfaceView;
-    }
 }
diff --git a/tests/unit-tests/proj.android/app/AndroidManifest.xml b/tests/unit-tests/proj.android/app/AndroidManifest.xml
@@ -21,7 +21,7 @@
             android:screenOrientation="sensorLandscape"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/app_name"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+            android:theme="@style/AxmolTheme.Light.Fullscreen"
             android:launchMode="singleTask"
             android:taskAffinity=""
             android:exported="true"  >

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ android {`
`14`	`14`	`sourceSets.main {`
`15`	`15`	`aidl.srcDir "../java/src"`
`16`	`16`	`java.srcDirs = ['../java/src','../ControllerManualAdapter/src']`
	`17`	`+ res.srcDir "../res"`
`17`	`18`	`manifest.srcFile "AndroidManifest.xml"`
`18`	`19`	`}`
`19`	`20`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ android {`
`19`	`19`	`sourceSets.main {`
`20`	`20`	`aidl.srcDir "../java/src"`
`21`	`21`	`java.srcDir "../java/src"`
	`22`	`+ res.srcDir "../res"`
`22`	`23`	`manifest.srcFile "AndroidManifest.xml"`
`23`	`24`	`}`
`24`	`25`