fix: keep the bottom-screen menu and layout editor open when the screen turns off (#2247)

This commit is contained in:
Kurt Himebauch authored and GitHub committed 2026-11-07 20:11:20 -05:00
1 parent 5b2f7a9a6d
commit ef46c011db
3 files changed
+16 -8

No files matched your search

@@ -55,6 +55,7 @@ import com.droiddeck.launcher.stores.StoreGameSidecar
import com.droiddeck.launcher.stores.StoreLaunchRequests
import com.droiddeck.launcher.stores.epic.EpicClient
import com.droiddeck.launcher.ui.SessionAchievements
import com.droiddeck.launcher.ui.screenIsOff
import com.droiddeck.launcher.gpu.Cardboard
import com.droiddeck.launcher.gpu.FrameGen
import com.droiddeck.launcher.gpu.HeadTracker
@@ -4566,7 +4567,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
displayManager.unregisterDisplayListener(displayListener)
com.droiddeck.launcher.input.DualScreen.unwatchTaken(bottomScreenListener)
contentResolver.unregisterContentObserver(refreshSettingObserver)
closeSecondScreen(reset = false)
if (!screenIsOff()) closeSecondScreen(reset = false)
startedScreens = (startedScreens - 1).coerceAtLeast(0)
updateGlassesScreen()
updateBottomGame()
@@ -4665,14 +4666,19 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
if (::twoFingerGestures.isInitialized) twoFingerGestures.cancel()
uiHandler.removeCallbacks(clearRecognizedGesture)
uiHandler.removeCallbacks(cursorResync)
gestureSettingsOpen = false
inputSettingsOpen = false
val screenOff = screenIsOff()
if (!screenOff) {
gestureSettingsOpen = false
inputSettingsOpen = false
}
releasePads()
heldKeys.clear()
heldButtons.clear()
drawerOpen = false
pcKeyboardOpen = false
achievementsOpen = false
if (!screenOff) {
drawerOpen = false
pcKeyboardOpen = false
achievementsOpen = false
}
(getSystemService(INPUT_SERVICE) as? InputManager)?.unregisterInputDeviceListener(deviceListener)
releaseDrawerDirection()
onScreenControls?.releaseAll()
@@ -18,6 +18,8 @@ import androidx.savedstate.setViewTreeSavedStateRegistryOwner
internal val LocalInputActivity = staticCompositionLocalOf<ComponentActivity?> { null }
fun ComponentActivity.screenIsOff(): Boolean = getSystemService(android.os.PowerManager::class.java)?.isInteractive == false
@Composable
internal fun InputDisplayContent(host: ComponentActivity, display: Display, onDismiss: () -> Unit, content: @Composable () -> Unit) {
val parent = rememberCompositionContext()
@@ -58,7 +60,7 @@ internal fun InputDisplayContent(host: ComponentActivity, display: Display, onDi
}
showPresentation()
val observer = LifecycleEventObserver { _, event ->
if (event == Lifecycle.Event.ON_STOP) presentation.hide()
if (event == Lifecycle.Event.ON_STOP && !host.screenIsOff()) presentation.hide()
if (event == Lifecycle.Event.ON_START) showPresentation()
}
host.lifecycle.addObserver(observer)
@@ -173,7 +173,7 @@ fun InputSurfaceDialog(profile: String, onDismiss: () -> Unit, onChanged: () ->
}
runCatching { presentation.show() }.onFailure { failure = it.message }
val observer = LifecycleEventObserver { _, event ->
if (event == Lifecycle.Event.ON_STOP) presentation.hide()
if (event == Lifecycle.Event.ON_STOP && !host.screenIsOff()) presentation.hide()
if (event == Lifecycle.Event.ON_START) runCatching { presentation.show() }
}
host.lifecycle.addObserver(observer)