From 7570ce7e18b955dd2f9cf2a426a4945e46b53e89 Mon Sep 17 00:00:00 2001 From: kaosjammo Date: Sun, 11 Oct 2026 04:33:59 +1100 Subject: [PATCH] Fix launcher fullscreen around display cutouts (#432) Co-authored-by: Jammo <8018115+kaosjammo@users.noreply.github.com> --- .../main/java/com/droiddeck/launcher/MainActivity.kt | 11 +++++++++++ .../java/com/droiddeck/launcher/ui/FrontEndScreen.kt | 7 +++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt index 53b8b7c22a..b60705d365 100644 --- a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt @@ -10,6 +10,7 @@ import java.io.File import android.content.pm.PackageManager import android.hardware.display.DisplayManager import android.net.Uri +import android.os.Build import android.os.Bundle import android.os.Handler import android.os.Looper @@ -17,6 +18,7 @@ import android.util.Log import android.view.Display import android.view.KeyEvent import android.view.View +import android.view.WindowManager import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.activity.result.contract.ActivityResultContracts @@ -934,6 +936,15 @@ class MainActivity : ComponentActivity() { } else { View.SYSTEM_UI_FLAG_LAYOUT_STABLE } + if (Build.VERSION.SDK_INT >= 28) { + window.attributes = window.attributes.apply { + layoutInDisplayCutoutMode = if (launcherFullscreen) { + WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES + } else { + WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT + } + } + } } /** On the Components page the pad's LB / RB step through GPU drivers, FEX, DXVK and VKD3D-Proton, wrapping around. */ diff --git a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt index 7bc0cb1cf5..fd80e44c4d 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/FrontEndScreen.kt @@ -33,13 +33,16 @@ import androidx.compose.foundation.layout.Box import androidx.compose.runtime.key import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.displayCutout import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.size -import androidx.compose.foundation.layout.systemBarsPadding +import androidx.compose.foundation.layout.systemBars import androidx.compose.foundation.layout.width +import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.filled.Settings import androidx.compose.material3.MaterialTheme @@ -468,7 +471,7 @@ private fun FrontEndScreenBody(s: FrontEndState, a: FrontEndActions, page: (@Com var anyFocused by remember { mutableStateOf(false) } Box( modifier = Modifier.fillMaxSize().background(colors.background) - .then(if (s.launcherFullscreen) Modifier else Modifier.systemBarsPadding()) + .windowInsetsPadding(if (s.launcherFullscreen) WindowInsets.displayCutout else WindowInsets.systemBars) .onFocusChanged { anyFocused = it.hasFocus }, ) { // Start controllers on the current page's main action, else on the rail.