From 0de64139144bfa6532eb7fec07258f929c8d82a8 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Wed, 21 Oct 2026 22:53:35 -0400 Subject: [PATCH] Revert dedicated second-screen activity (#1288) --- app/src/main/AndroidManifest.xml | 9 -- .../com/droiddeck/launcher/SessionActivity.kt | 6 +- .../launcher/session/SessionService.kt | 1 - ...ontrols.kt => SecondScreenPresentation.kt} | 57 +++++-- .../launcher/ui/SecondScreenWindow.kt | 139 ------------------ .../launcher/ui/SecondScreenActivityTest.kt | 61 -------- 6 files changed, 51 insertions(+), 222 deletions(-) rename app/src/main/java/com/droiddeck/launcher/ui/{SecondScreenControls.kt => SecondScreenPresentation.kt} (90%) delete mode 100644 app/src/main/java/com/droiddeck/launcher/ui/SecondScreenWindow.kt delete mode 100644 app/src/test/java/com/droiddeck/launcher/ui/SecondScreenActivityTest.kt diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 87768b8f72..5439940930 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -177,15 +177,6 @@ android:resizeableActivity="true" android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize|keyboard|keyboardHidden|navigation|uiMode|density" /> - - diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt index 3c0c6f2301..f91df64201 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -1560,7 +1560,6 @@ class SessionService : Service() { } override fun onTaskRemoved(rootIntent: Intent?) { - if (rootIntent?.component?.className == com.droiddeck.launcher.ui.SecondScreenActivity::class.java.name) return if (pipTask || xrActivityVisible) { Log.i(TAG, "panel task dismissed - retaining the session under its active surface policy") activityVisible = false diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenControls.kt b/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt similarity index 90% rename from app/src/main/java/com/droiddeck/launcher/ui/SecondScreenControls.kt rename to app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt index a7a757ebf7..df972e00f4 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenControls.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenPresentation.kt @@ -1,17 +1,21 @@ package com.droiddeck.launcher.ui import com.droiddeck.launcher.R +import android.app.Presentation import android.content.ClipboardManager import android.content.Context import android.graphics.Canvas import android.graphics.Color +import android.os.Bundle import android.util.Log +import android.view.Display import android.view.Gravity import android.view.KeyEvent import android.view.MotionEvent import android.view.View import android.view.ViewGroup import android.view.ViewConfiguration +import android.view.WindowManager import android.view.inputmethod.InputMethodManager import android.widget.Button import android.widget.FrameLayout @@ -33,9 +37,9 @@ import com.termux.terminal.TerminalSessionClient import com.termux.view.TerminalView import com.termux.view.TerminalViewClient -internal class SecondScreenControls( - context: Context, +class SecondScreenPresentation( private val sessionActivity: SessionActivity, + display: Display, private val sendPointer: (x: Float, y: Float, width: Float, height: Float) -> Unit, private val sendButton: (button: Int, pressed: Boolean) -> Unit, private val sendWheel: (steps: Int) -> Unit, @@ -43,8 +47,12 @@ internal class SecondScreenControls( private val onQam: () -> Unit, private val onClose: () -> Unit, private val pad: PadBridge? = null, -) : LinearLayout(context) { - private val root get() = this +) : Presentation(sessionActivity, display) { + private val root = LinearLayout(context).apply { + orientation = LinearLayout.VERTICAL + setBackgroundColor(Color.rgb(15, 18, 22)) + isFocusableInTouchMode = true + } private var currentMode = SecondScreenMode.NONE private var keyboardHost: KeyboardHost? = null private var terminalSession: TerminalSession? = null @@ -52,22 +60,35 @@ internal class SecondScreenControls( private var terminalPid = -1 private var ctrlActive = false private var altActive = false + private var created = false + init { - orientation = VERTICAL - setBackgroundColor(Color.rgb(15, 18, 22)) - isFocusableInTouchMode = true + setCancelable(false) + setCanceledOnTouchOutside(false) + setOnDismissListener { closeTerminal() } + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + created = true + window?.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) + window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) + setContentView(root) + applyImmersiveMode() + renderMode() } fun showMode(mode: SecondScreenMode) { - if (currentMode == mode) return + if (currentMode == mode && isShowing) return currentMode = mode - renderMode() + if (created) renderMode() } fun closeControls() { closeTerminal() keyboardHost?.hide() keyboardHost = null + dismiss() } override fun dispatchKeyEvent(event: KeyEvent): Boolean { @@ -77,6 +98,14 @@ internal class SecondScreenControls( return super.dispatchKeyEvent(event) } + override fun onWindowFocusChanged(hasFocus: Boolean) { + super.onWindowFocusChanged(hasFocus) + if (hasFocus) { + applyImmersiveMode() + sessionActivity.refreshClipboard() + } + } + private fun renderMode() { keyboardHost?.hide() keyboardHost = null @@ -264,6 +293,16 @@ internal class SecondScreenControls( private fun weightParams() = LinearLayout.LayoutParams(-1, 0, 1f) + private fun applyImmersiveMode() { + @Suppress("DEPRECATION") + window?.decorView?.systemUiVisibility = (View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY + or View.SYSTEM_UI_FLAG_FULLSCREEN + or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION + or View.SYSTEM_UI_FLAG_LAYOUT_STABLE + or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) + } + private inner class TrackpadView(context: Context) : View(context) { private val gestures = TouchpadGestures(ViewConfiguration.get(context).scaledTouchSlop.toFloat(), object : PointerGestures.Listener { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenWindow.kt b/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenWindow.kt deleted file mode 100644 index 55efd2a006..0000000000 --- a/app/src/main/java/com/droiddeck/launcher/ui/SecondScreenWindow.kt +++ /dev/null @@ -1,139 +0,0 @@ -package com.droiddeck.launcher.ui - -import android.app.Activity -import android.app.ActivityOptions -import android.content.Intent -import android.os.Bundle -import android.view.Display -import android.view.View -import android.view.WindowManager -import com.droiddeck.launcher.SessionActivity -import com.droiddeck.launcher.input.PadBridge -import com.droiddeck.launcher.input.SecondScreenMode -import com.droiddeck.launcher.session.SessionState -import java.lang.ref.WeakReference -import java.util.concurrent.atomic.AtomicLong - -class SecondScreenWindow( - private val sessionActivity: SessionActivity, - val display: Display, - private val sendPointer: (Float, Float, Float, Float) -> Unit, - private val sendButton: (Int, Boolean) -> Unit, - private val sendWheel: (Int) -> Unit, - private val onSteamMenu: () -> Unit, - private val onQam: () -> Unit, - private val onClose: () -> Unit, - private val pad: PadBridge? = null, -) { - private val token = tokens.incrementAndGet() - private var activity = WeakReference(null) - private var controls: SecondScreenControls? = null - private var mode = SecondScreenMode.NONE - private var launching = false - private var closed = false - val window get() = activity.get()?.window - val isShowing get() = !closed && (launching || activity.get()?.isFinishing == false) - - fun show() { - if (isShowing || closed) return - owners[token] = WeakReference(this) - launching = true - try { - val intent = Intent(sessionActivity, SecondScreenActivity::class.java) - .putExtra(OWNER, token) - .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK) - sessionActivity.startActivity(intent, ActivityOptions.makeBasic().setLaunchDisplayId(display.displayId).toBundle()) - } catch (error: Exception) { - launching = false - owners.remove(token) - throw error - } - } - - fun showMode(mode: SecondScreenMode) { - this.mode = mode - controls?.showMode(mode) - } - - fun closeControls() { - closed = true - launching = false - owners.remove(token) - controls?.closeControls() - controls = null - activity.get()?.finishAndRemoveTask() - activity.clear() - } - - internal fun attach(host: SecondScreenActivity): View { - controls?.closeControls() - activity = WeakReference(host) - launching = false - return SecondScreenControls(host, sessionActivity, sendPointer, sendButton, sendWheel, - onSteamMenu, onQam, onClose, pad).also { - controls = it - it.showMode(mode) - } - } - - internal fun detach(host: SecondScreenActivity) { - if (activity.get() !== host) return - controls?.closeControls() - controls = null - activity.clear() - if (host.isFinishing && !closed) onClose() - } - - internal fun refreshClipboard() = sessionActivity.refreshClipboard() - - companion object { - private const val OWNER = "secondScreenOwner" - private val tokens = AtomicLong() - private val owners = mutableMapOf>() - internal fun find(intent: Intent): SecondScreenWindow? = - owners[intent.getLongExtra(OWNER, 0)]?.get()?.takeUnless { it.closed } - } -} - -class SecondScreenActivity : Activity() { - private var owner: SecondScreenWindow? = null - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - val host = SecondScreenWindow.find(intent) - if (host == null || !SessionState.running) { - finishAndRemoveTask() - return - } - owner = host - window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) - window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) - setContentView(host.attach(this)) - applyImmersiveMode() - } - - override fun onWindowFocusChanged(hasFocus: Boolean) { - super.onWindowFocusChanged(hasFocus) - if (hasFocus) { - applyImmersiveMode() - owner?.refreshClipboard() - } - } - - @Deprecated("Back is handled by the session controls") - override fun onBackPressed() = Unit - - override fun onDestroy() { - owner?.detach(this) - owner = null - super.onDestroy() - } - - private fun applyImmersiveMode() { - @Suppress("DEPRECATION") - window.decorView.systemUiVisibility = (View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY - or View.SYSTEM_UI_FLAG_FULLSCREEN or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION - or View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN - or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION) - } -} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/SecondScreenActivityTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/SecondScreenActivityTest.kt deleted file mode 100644 index 040ed3ff3e..0000000000 --- a/app/src/test/java/com/droiddeck/launcher/ui/SecondScreenActivityTest.kt +++ /dev/null @@ -1,61 +0,0 @@ -package com.droiddeck.launcher.ui - -import android.app.Application -import android.content.Intent -import android.hardware.display.DisplayManager -import android.view.Display -import com.droiddeck.launcher.SessionActivity -import com.droiddeck.launcher.session.SessionService -import com.droiddeck.launcher.session.SessionState -import org.junit.After -import org.junit.Assert.assertFalse -import org.junit.Assert.assertTrue -import org.junit.Before -import org.junit.Test -import org.junit.runner.RunWith -import org.robolectric.Robolectric -import org.robolectric.RobolectricTestRunner -import org.robolectric.Shadows.shadowOf -import org.robolectric.annotation.Config -import org.robolectric.annotation.LooperMode - -@RunWith(RobolectricTestRunner::class) -@Config(application = Application::class, manifest = Config.NONE, sdk = [28, 33]) -@LooperMode(LooperMode.Mode.PAUSED) -class SecondScreenActivityTest { - @Before fun setUp() { - SessionState.running = true - SessionState.stopRequested = false - } - - @After fun tearDown() { - SessionState.running = false - SessionState.stopRequested = false - } - - @Test fun removingControlsTaskDoesNotStopTheRunningSession() { - val service = Robolectric.buildService(SessionService::class.java).get() - service.onTaskRemoved(Intent(service, SecondScreenActivity::class.java)) - assertTrue(SessionState.running) - assertFalse(SessionState.stopRequested) - } - - @Test fun activityRestoredWithoutItsSessionOwnerFinishes() { - val activity = Robolectric.buildActivity(SecondScreenActivity::class.java).create().get() - assertTrue(activity.isFinishing) - assertTrue(SessionState.running) - } - - @Test fun closingBeforeTheSecondaryActivityStartsRejectsTheLateLaunch() { - val session = Robolectric.buildActivity(SessionActivity::class.java).get() - val display = session.getSystemService(DisplayManager::class.java).getDisplay(Display.DEFAULT_DISPLAY) - val controls = SecondScreenWindow(session, display, { _, _, _, _ -> }, { _, _ -> }, {}, {}, {}, {}) - controls.show() - val intent = shadowOf(session).nextStartedActivity - controls.closeControls() - val activity = Robolectric.buildActivity(SecondScreenActivity::class.java, intent).create().get() - assertTrue(activity.isFinishing) - assertFalse(controls.isShowing) - assertTrue(SessionState.running) - } -}