From 08a8de9bc4e2c94578cef0aa5bdf14073360cef3 Mon Sep 17 00:00:00 2001 From: KeegantheVeganat0r <58369898+KeegantheVeganat0r@users.noreply.github.com> Date: Thu, 12 Nov 2026 16:38:31 +0000 Subject: [PATCH] Fix Agent keyboard panning and collapsed landscape input (#2530) * fix(agent): prevent Android panning the IME-aware chat * fix(agent): reserve composer space before chat status panels --- .../droiddeck/launcher/FrontEndActivity.kt | 1 - .../com/droiddeck/launcher/ui/AgentPage.kt | 26 ++++++++++++++++--- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 3b6b6378f6..699dd9643b 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -1099,7 +1099,6 @@ class FrontEndActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) drivers.restartBlocked = ::runtimeChangesBlocked drivers.loadTpUbwcMode() pendingSessionLogExport = savedInstanceState?.getString(KEY_PENDING_SESSION_LOG_EXPORT)?.let(::File) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt index 01a684abec..645ce77f1c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AgentPage.kt @@ -1,5 +1,8 @@ package com.droiddeck.launcher.ui +import android.app.Activity +import android.content.ContextWrapper +import android.view.WindowManager import androidx.activity.compose.LocalActivityResultRegistryOwner import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts @@ -45,6 +48,7 @@ import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.MutableState import androidx.compose.runtime.derivedStateOf @@ -56,11 +60,14 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip +import androidx.compose.ui.draw.clipToBounds import androidx.compose.ui.focus.onFocusChanged import androidx.compose.ui.graphics.SolidColor import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.platform.LocalView +import androidx.compose.ui.window.DialogWindowProvider import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.TextStyle @@ -86,6 +93,17 @@ private val CLI_COMMANDS = listOf("/compact", "/cost", "/review", "/init") @Composable internal fun AgentPage(modifier: Modifier, inputModifier: Modifier = Modifier, visible: Boolean = true) { val context = LocalContext.current + val view = LocalView.current + DisposableEffect(view, visible) { + val window = (view.parent as? DialogWindowProvider)?.window + ?: generateSequence(view.context) { (it as? ContextWrapper)?.baseContext } + .filterIsInstance().firstOrNull()?.window + val previousMode = window?.attributes?.softInputMode + if (visible) window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING) + onDispose { + if (visible && previousMode != null) window?.setSoftInputMode(previousMode) + } + } remember { AgentHost.refresh(context) } LaunchedEffect(AgentHost.unseen, visible) { if (visible) AgentHost.seen() } remember { AgentSetup.check(context) } @@ -102,9 +120,11 @@ internal fun AgentPage(modifier: Modifier, inputModifier: Modifier = Modifier, v AgentPanel.HISTORY -> AgentHistory(Modifier.weight(1f)) { panel = AgentPanel.NONE } AgentPanel.PROCESSES -> AgentProcessList(Modifier.weight(1f)) else -> { - if (panel == AgentPanel.MODEL) AgentModelPicker() - AgentConversation(Modifier.weight(1f)) - AgentStatus() + Column(Modifier.weight(1f).clipToBounds()) { + if (panel == AgentPanel.MODEL) AgentModelPicker() + AgentConversation(Modifier.weight(1f)) + AgentStatus() + } AgentComposer(draft, inputModifier) { panel = it } } }