diff --git a/app/build.gradle b/app/build.gradle index 7f992a5f42..af25c45878 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -295,6 +295,16 @@ if (uvcDir) { } tasks.named('preBuild').configure { dependsOn(stageRuntimeAssets) } +android.sourceSets.main.java.srcDir(rootProject.file('shortcuts/src/protocol/java')) +def stageShortcuts = tasks.register('stageShortcuts', Copy) { + dependsOn(':shortcuts:assembleRelease') + from(project(':shortcuts').layout.buildDirectory.file('outputs/apk/release/shortcuts-release.apk')) + into(layout.buildDirectory.dir('shortcutsAssets')) + rename { 'shortcuts.apk' } +} +android.sourceSets.main.assets.srcDir(layout.buildDirectory.dir('shortcutsAssets')) +tasks.named('preBuild').configure { dependsOn(stageShortcuts) } + def stageGogNotices = tasks.register('stageGogNotices', Copy) { from(layout.projectDirectory.dir('src/main/rust/stores/vendor/xdelta3')) { include 'LICENSE', 'README.droiddeck.md' } into(layout.buildDirectory.dir('gogNotices/licenses/xdelta3')) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 172da8d450..2adbfc86cd 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -89,21 +89,11 @@ android:label="@string/steam_wall_label" android:theme="@android:style/Theme.Translucent.NoTitleBar" android:exported="true" /> - + - + - - - - - - integrationSettings(SteamIntegration.brightnessSettings(this)) SteamIntegration.Feature.HOME -> if (HomeApp.isDefault(this)) HomeApp.openSystemHomeSettings(this) else offerHomeScreen() SteamIntegration.Feature.SHORTCUTS -> { - if (!integrationState.shortcuts) shortcutsTried = true - SteamIntegration.setShortcutsListed(this, true) - integrationSettings(SteamIntegration.shortcutSettings(this), android.provider.Settings.ACTION_ACCESSIBILITY_SETTINGS) + if (integrationState.shortcuts) openShortcutSettings() else installShortcuts() } } } - private fun openAppInfo() = - integrationSettings(Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS, Uri.parse("package:$packageName"))) + private fun openShortcutSettings() = + integrationSettings(SteamIntegration.shortcutSettings(this), android.provider.Settings.ACTION_ACCESSIBILITY_SETTINGS) + + private fun installShortcuts() { + if (ShortcutsInstall.running) return + ShortcutsInstall.running = true + Thread({ + val result = runCatching { + val apk = SteamIntegration.bundledShortcuts(this) + when { + SteamIntegration.shortcutsInstalled(this, apk) -> { + ShortcutsInstall.running = false + ui.post { shortcutsReady() } + } + !com.droiddeck.launcher.update.SelfInstaller.canInstall(this) -> { + ShortcutsInstall.running = false + ui.post { integrationSettings(com.droiddeck.launcher.update.SelfInstaller.permissionIntent(this)) } + } + else -> com.droiddeck.launcher.update.SelfInstaller.install(this, apk, com.droiddeck.shortcuts.Relay.PACKAGE, + SteamIntegration.SHORTCUTS_STATUS) { id -> ShortcutsInstall.session = id } + } + } + result.onFailure { e -> + ShortcutsInstall.running = false + ui.post { shortcutsFailed(e.message) } + } + }, "shortcuts-install").start() + } + + private fun shortcutsReady() { + shortcutsTried = true + Thread({ + val deadline = android.os.SystemClock.uptimeMillis() + 3000 + while (!SteamIntegration.shortcutsListed(this) && android.os.SystemClock.uptimeMillis() < deadline) Thread.sleep(100) + ui.post { openShortcutSettings() } + }, "shortcuts-listed").start() + } + + private fun shortcutsFailed(message: String?) { + android.widget.Toast.makeText(this, message?.let { getString(R.string.integration_shortcuts_install_failed_with, it) } + ?: getString(R.string.integration_shortcuts_install_failed), android.widget.Toast.LENGTH_LONG).show() + } + + private val shortcutsInstallStatus = object : android.content.BroadcastReceiver() { + override fun onReceive(context: android.content.Context, intent: Intent) { + val session = intent.getIntExtra(android.content.pm.PackageInstaller.EXTRA_SESSION_ID, -1) + if (session < 0 || session != ShortcutsInstall.session) return + val status = intent.getIntExtra(android.content.pm.PackageInstaller.EXTRA_STATUS, + android.content.pm.PackageInstaller.STATUS_FAILURE) + if (status != android.content.pm.PackageInstaller.STATUS_PENDING_USER_ACTION) { + ShortcutsInstall.session = -1 + ShortcutsInstall.running = false + } + when (status) { + android.content.pm.PackageInstaller.STATUS_PENDING_USER_ACTION -> { + val confirm = if (android.os.Build.VERSION.SDK_INT >= 33) intent.getParcelableExtra(Intent.EXTRA_INTENT, Intent::class.java) + else @Suppress("DEPRECATION") intent.getParcelableExtra(Intent.EXTRA_INTENT) + val safe = confirm?.let { com.droiddeck.launcher.update.SelfInstaller.safeConfirmIntent(this@FrontEndActivity, it) } + if (safe == null || runCatching { startActivity(safe) }.isFailure) shortcutsFailed(null) + } + android.content.pm.PackageInstaller.STATUS_SUCCESS -> shortcutsReady() + else -> shortcutsFailed(intent.getStringExtra(android.content.pm.PackageInstaller.EXTRA_STATUS_MESSAGE)) + } + } + } + + private fun openAppInfo() = integrationSettings(SteamIntegration.shortcutsAppInfo()) private fun openWifiDiscoverySettings() { if (!WifiDiscovery.permissionGranted(this)) { @@ -1139,6 +1202,9 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet homeChoiceOpen = savedInstanceState?.getBoolean(STATE_HOME_CHOICE_OPEN) == true gameSpaceOffered = savedInstanceState?.getBoolean(STATE_GAME_SPACE_OFFERED) == true if (savedInstanceState == null) readIntegrationIntent(intent) + val shortcutsFilter = android.content.IntentFilter(SteamIntegration.SHORTCUTS_STATUS) + if (android.os.Build.VERSION.SDK_INT >= 33) registerReceiver(shortcutsInstallStatus, shortcutsFilter, RECEIVER_NOT_EXPORTED) + else registerReceiver(shortcutsInstallStatus, shortcutsFilter) readGameIntent(intent) // A Lab build is usually the agent's work, so the app comes back where the agent is. if (savedInstanceState == null && navRequest == null && com.droiddeck.launcher.lab.LabOverlay.promoted && com.droiddeck.launcher.agent.AgentTab.visible) navRequest = "agent" @@ -1975,7 +2041,6 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet launcherOrientation = com.droiddeck.launcher.core.AppUiPrefs.orientation(this) requestedOrientation = launcherOrientation homePage = com.droiddeck.launcher.core.AppUiPrefs.homePage(this) - SteamIntegration.syncShortcutsListing(this) refreshWifiDiscovery() com.droiddeck.launcher.stores.StoresState.refresh(this) com.droiddeck.launcher.stores.StoresState.libraryListener = { refreshAddedGames(); refresh() } @@ -2084,6 +2149,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet gameLaunchRequest.incrementAndGet() cancelCompatLaunch() updates.unregister() + runCatching { unregisterReceiver(shortcutsInstallStatus) } super.onDestroy() } @@ -3305,3 +3371,9 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet private val WCP_EXT = listOf("wcp") } } + +// The install session outlives the activity when Android recreates it mid-install. +private object ShortcutsInstall { + @Volatile var session = -1 + @Volatile var running = false +} diff --git a/app/src/main/java/com/droiddeck/launcher/core/ShortcutsListingReceiver.kt b/app/src/main/java/com/droiddeck/launcher/core/ShortcutsListingReceiver.kt deleted file mode 100644 index f9ee889bdf..0000000000 --- a/app/src/main/java/com/droiddeck/launcher/core/ShortcutsListingReceiver.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.droiddeck.launcher.core - -import android.content.BroadcastReceiver -import android.content.Context -import android.content.Intent - -class ShortcutsListingReceiver : BroadcastReceiver() { - override fun onReceive(context: Context, intent: Intent) { - if (intent.action == Intent.ACTION_MY_PACKAGE_REPLACED) SteamIntegration.syncShortcutsListing(context) - } -} diff --git a/app/src/main/java/com/droiddeck/launcher/core/SteamIntegration.kt b/app/src/main/java/com/droiddeck/launcher/core/SteamIntegration.kt index b9968ebdb5..84f87cca13 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/SteamIntegration.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/SteamIntegration.kt @@ -1,20 +1,21 @@ package com.droiddeck.launcher.core -import android.accessibilityservice.AccessibilityServiceInfo import android.content.ComponentName import android.content.Context import android.content.Intent import android.content.pm.PackageManager import android.net.Uri import android.provider.Settings -import android.view.accessibility.AccessibilityManager import com.droiddeck.launcher.HomeApp -import com.droiddeck.launcher.input.HomeButtonService import com.droiddeck.launcher.session.SessionPrefs +import com.droiddeck.shortcuts.Relay +import java.io.File object SteamIntegration { const val ACTION_SETUP = "com.droiddeck.launcher.STEAM_INTEGRATION" const val EXTRA_FEATURE = "integration_feature" + const val SHORTCUTS_STATUS = "com.droiddeck.launcher.SHORTCUTS_INSTALL_STATUS" + private const val SHORTCUTS_ASSET = "shortcuts.apk" enum class Feature { WIFI, BRIGHTNESS, HOME, SHORTCUTS } data class State( @@ -36,11 +37,7 @@ object SteamIntegration { locationOn = WifiDiscovery.locationEnabled(context), brightness = Settings.System.canWrite(context), home = HomeApp.isDefault(context), - shortcuts = context.getSystemService(AccessibilityManager::class.java) - .getEnabledAccessibilityServiceList(AccessibilityServiceInfo.FEEDBACK_ALL_MASK).any { - val service = it.resolveInfo.serviceInfo - ComponentName(service.packageName, service.name) == ComponentName(context, HomeButtonService::class.java) - }, + shortcuts = shortcutsEnabled(context), shortcutsRestricted = restrictedSettings(context), suggested = !SessionPrefs.sessionPrefs(context).getBoolean("steam_integration_seen", false), ) @@ -48,48 +45,53 @@ object SteamIntegration { private fun restrictedSettings(context: Context): Boolean { if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.TIRAMISU) return false val mode = runCatching { + val uid = context.packageManager.getApplicationInfo(Relay.PACKAGE, 0).uid context.getSystemService(android.app.AppOpsManager::class.java) - .unsafeCheckOpNoThrow("android:access_restricted_settings", android.os.Process.myUid(), context.packageName) + .unsafeCheckOpNoThrow("android:access_restricted_settings", uid, Relay.PACKAGE) }.getOrDefault(android.app.AppOpsManager.MODE_ALLOWED) return mode == android.app.AppOpsManager.MODE_ERRORED || mode == android.app.AppOpsManager.MODE_IGNORED } - private fun shortcutsComponent(context: Context) = ComponentName(context, HomeButtonService::class.java) + private val shortcutsComponent = ComponentName(Relay.PACKAGE, Relay.SERVICE) - fun shortcutsChosen(context: Context): Boolean = shortcutsSelection(context) == true - - private fun shortcutsSelection(context: Context): Boolean? { - val target = shortcutsComponent(context) + fun shortcutsEnabled(context: Context): Boolean { val enabled = runCatching { Settings.Secure.getString(context.contentResolver, Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES) - }.getOrElse { return null }.orEmpty() - return enabled.split(':').any { ComponentName.unflattenFromString(it.trim()) == target } + }.getOrNull().orEmpty() + return enabled.split(':').any { ComponentName.unflattenFromString(it.trim()) == shortcutsComponent } } - fun setShortcutsListed(context: Context, listed: Boolean) { + fun shortcutsListed(context: Context): Boolean = + context.getSystemService(android.view.accessibility.AccessibilityManager::class.java) + ?.installedAccessibilityServiceList.orEmpty() + .any { ComponentName(it.resolveInfo.serviceInfo.packageName, it.resolveInfo.serviceInfo.name) == shortcutsComponent } + + fun bundledShortcuts(context: Context): File { + val target = File(context.cacheDir, SHORTCUTS_ASSET) + context.assets.open(SHORTCUTS_ASSET).use { input -> target.outputStream().use { input.copyTo(it) } } + return target + } + + fun shortcutsInstalled(context: Context, bundled: File): Boolean { val packages = context.packageManager - val component = shortcutsComponent(context) - val state = if (listed) PackageManager.COMPONENT_ENABLED_STATE_ENABLED else PackageManager.COMPONENT_ENABLED_STATE_DISABLED - runCatching { - if (packages.getComponentEnabledSetting(component) != state) { - packages.setComponentEnabledSetting(component, state, PackageManager.DONT_KILL_APP) - } - } - } - - fun syncShortcutsListing(context: Context) { - shortcutsSelection(context)?.let { setShortcutsListed(context, it) } + @Suppress("DEPRECATION") + val installed = runCatching { packages.getPackageInfo(Relay.PACKAGE, 0).versionCode }.getOrNull() ?: return false + @Suppress("DEPRECATION") + val shipped = packages.getPackageArchiveInfo(bundled.absolutePath, 0)?.versionCode ?: return true + return installed >= shipped } fun dismissSuggestion(context: Context) { SessionPrefs.sessionPrefs(context).edit().putBoolean("steam_integration_seen", true).apply() } + fun shortcutsAppInfo() = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS, Uri.parse("package:${Relay.PACKAGE}")) + fun brightnessSettings(context: Context) = Intent(Settings.ACTION_MANAGE_WRITE_SETTINGS, Uri.parse("package:${context.packageName}")) fun shortcutSettings(context: Context): Intent { - val service = ComponentName(context, HomeButtonService::class.java).flattenToString() + val service = shortcutsComponent.flattenToString() return Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS) .putExtra(":settings:fragment_args_key", service) .putExtra(":settings:show_fragment_args", android.os.Bundle().apply { putString(":settings:fragment_args_key", service) }) diff --git a/app/src/main/java/com/droiddeck/launcher/input/BottomScreenGuests.kt b/app/src/main/java/com/droiddeck/launcher/input/BottomScreenGuests.kt index 574536e18a..d72e6a2d92 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/BottomScreenGuests.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/BottomScreenGuests.kt @@ -1,10 +1,8 @@ package com.droiddeck.launcher.input -import android.accessibilityservice.AccessibilityService -import android.accessibilityservice.AccessibilityServiceInfo +import android.content.Context import android.content.Intent import android.content.pm.PackageManager -import android.graphics.Rect import android.hardware.display.DisplayManager import android.os.Build import android.os.Handler @@ -12,9 +10,9 @@ import android.os.HandlerThread import android.os.SystemClock import android.util.Log import android.view.Display -import android.view.accessibility.AccessibilityEvent import android.view.accessibility.AccessibilityWindowInfo import android.view.inputmethod.InputMethodManager +import com.droiddeck.shortcuts.Relay import java.util.concurrent.ConcurrentHashMap object BottomScreenGuests { @@ -45,7 +43,7 @@ object BottomScreenGuests { sdk >= 33 && DualScreen.yieldsBottom(model) } -class BottomScreenWatch(private val service: AccessibilityService) { +class BottomScreenWatch(private val service: Context) { private class Arrival(val pkg: String, val at: Long) private val thread = HandlerThread("bottom-screen").apply { start() } @@ -57,33 +55,22 @@ class BottomScreenWatch(private val service: AccessibilityService) { private var holders: Map = emptyMap() private var ownWindows: Map> = emptyMap() private val ownShownAt = mutableMapOf() - private val check = Runnable { evaluate() } fun start() { current = this - service.serviceInfo = service.serviceInfo?.apply { - eventTypes = eventTypes or AccessibilityEvent.TYPE_WINDOWS_CHANGED or AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED - flags = flags or AccessibilityServiceInfo.FLAG_RETRIEVE_INTERACTIVE_WINDOWS - } handler.post { homes = homePackages() keyboards = keyboardPackages() - evaluate() } } - fun onEvent(event: AccessibilityEvent) { - when (event.eventType) { - AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED -> { - val pkg = event.packageName?.toString() ?: return - if (event.displayId == Display.DEFAULT_DISPLAY || pkg == own || pkg == SYSTEM_UI) return - arrivals[event.displayId] = Arrival(pkg, event.eventTime) - } - AccessibilityEvent.TYPE_WINDOWS_CHANGED -> Unit - else -> return - } - handler.removeCallbacks(check) - handler.postDelayed(check, 150) + fun onArrival(displayId: Int, pkg: String, at: Long) { + if (displayId == Display.DEFAULT_DISPLAY || pkg == own || pkg == SYSTEM_UI) return + arrivals[displayId] = Arrival(pkg, at) + } + + fun onWindows(all: Map>) { + handler.post { evaluate(all) } } fun stop() { @@ -97,25 +84,22 @@ class BottomScreenWatch(private val service: AccessibilityService) { thread.quitSafely() } - private fun evaluate() { + private fun evaluate(all: Map>) { val seen = HashMap(arrivals) - val all = runCatching { service.windowsOnAllDisplays }.getOrNull() ?: return val displays = service.getSystemService(DisplayManager::class.java) ?: return val taken = mutableMapOf() val shown = mutableMapOf>() val now = SystemClock.uptimeMillis() - for (i in 0 until all.size()) { - val id = all.keyAt(i) + for ((id, list) in all) { if (id == Display.DEFAULT_DISPLAY) continue val display = displays.getDisplay(id)?.takeIf(DualScreen::builtIn) ?: continue - val windows = all.valueAt(i) + val windows = list .filter { !BottomScreenGuests.ignorable(it.type) && cover(it, display) >= BottomScreenGuests.MIN_COVER } .sortedByDescending { it.layer } - .map { it to packageOf(it) } - val ours = windows.filter { it.second == own }.map { it.first.id }.toSet() + val ours = windows.filter { it.pkg == own }.map { it.id }.toSet() if (!ownWindows[id].orEmpty().containsAll(ours)) ownShownAt[id] = now shown[id] = ours - val topPkg = windows.firstNotNullOfOrNull { it.second?.takeUnless { pkg -> pkg == own } } + val topPkg = windows.firstNotNullOfOrNull { it.pkg?.takeUnless { pkg -> pkg == own } } val arrival = seen[id]?.takeIf { BottomScreenGuests.current(it.at, ownShownAt[id]) } seen[id]?.takeIf { topPkg != null || arrival == null }?.let { arrivals.remove(id, it) } BottomScreenGuests.holder(topPkg, arrival?.pkg?.takeUnless { it in keyboards }, homes)?.let { taken[id] = it } @@ -127,15 +111,11 @@ class BottomScreenWatch(private val service: AccessibilityService) { DualScreen.setTaken(taken.keys) } - private fun cover(window: AccessibilityWindowInfo, display: Display): Float { - val bounds = Rect().also(window::getBoundsInScreen) + private fun cover(window: Relay.Window, display: Display): Float { val area = display.mode.physicalWidth.toFloat() * display.mode.physicalHeight - return if (area <= 0f) 0f else bounds.width().toFloat() * bounds.height() / area + return if (area <= 0f) 0f else window.bounds.width().toFloat() * window.bounds.height() / area } - private fun packageOf(window: AccessibilityWindowInfo): String? = - runCatching { window.getRoot(0)?.packageName?.toString() }.getOrNull() - private fun homePackages(): Set { val pm = service.packageManager return listOf(Intent.CATEGORY_HOME, Intent.CATEGORY_SECONDARY_HOME).flatMap { category -> @@ -154,6 +134,7 @@ class BottomScreenWatch(private val service: AccessibilityService) { private companion object { @Volatile var current: BottomScreenWatch? = null + const val TAG = "BottomScreen" const val SYSTEM_UI = "com.android.systemui" } diff --git a/app/src/main/java/com/droiddeck/launcher/input/HomeButtonService.kt b/app/src/main/java/com/droiddeck/launcher/input/ShortcutsRelay.kt similarity index 61% rename from app/src/main/java/com/droiddeck/launcher/input/HomeButtonService.kt rename to app/src/main/java/com/droiddeck/launcher/input/ShortcutsRelay.kt index 2f17ef1eae..6c24a7a472 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/HomeButtonService.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/ShortcutsRelay.kt @@ -1,14 +1,17 @@ package com.droiddeck.launcher.input -import android.accessibilityservice.AccessibilityService +import android.app.Service import android.content.Context import android.content.Intent import android.hardware.input.InputManager +import android.os.Binder import android.os.Handler +import android.os.IBinder import android.os.Looper +import android.os.Parcel import android.view.KeyEvent -import android.view.accessibility.AccessibilityEvent import com.droiddeck.launcher.HomeApp +import com.droiddeck.shortcuts.Relay object HomeButtonShortcuts { private var owner: Any? = null @@ -101,38 +104,78 @@ object SystemKeyCapture { } } -class HomeButtonService : AccessibilityService(), InputManager.InputDeviceListener { +class ShortcutsRelay : Service(), InputManager.InputDeviceListener { + private val main = Handler(Looper.getMainLooper()) + private val trusted = java.util.concurrent.ConcurrentHashMap.newKeySet() private var bottomScreen: BottomScreenWatch? = null - override fun onServiceConnected() { - getSystemService(InputManager::class.java).registerInputDeviceListener(this, Handler(Looper.getMainLooper())) - if (bottomScreen == null && BottomScreenGuests.supported()) bottomScreen = BottomScreenWatch(this).also { it.start() } + private val binder = object : Binder() { + override fun onTransact(code: Int, data: Parcel, reply: Parcel?, flags: Int): Boolean { + if (code !in Relay.CONFIG..Relay.WINDOWS) return super.onTransact(code, data, reply, flags) + data.enforceInterface(Relay.DESCRIPTOR) + if (!trusts(Binder.getCallingUid())) return false + when (code) { + Relay.CONFIG -> reply?.writeInt(if (bottomScreen != null) Relay.WANTS_WINDOWS else 0) + Relay.KEY -> reply?.writeInt(if (onMain(KeyEvent.CREATOR.createFromParcel(data))) 1 else 0) + Relay.INTERRUPT -> main.post { HomeButtonShortcuts.release() } + Relay.ARRIVAL -> bottomScreen?.onArrival(data.readInt(), data.readString() ?: return true, data.readLong()) + Relay.WINDOWS -> bottomScreen?.onWindows(Relay.decode(data.createByteArray() ?: return true)) + } + return true + } } - private fun stopBottomScreen() { - bottomScreen?.stop() - bottomScreen = null + private fun trusts(uid: Int): Boolean { + if (uid !in trusted) { + if (!packageManager.getPackagesForUid(uid).orEmpty().contains(Relay.PACKAGE)) return false + trusted += uid + } + return com.droiddeck.launcher.core.SteamIntegration.shortcutsEnabled(this) + } + + private fun onMain(event: KeyEvent): Boolean { + // A key the companion already gave up on must not run later and leave a press without its release. + val claimed = java.util.concurrent.atomic.AtomicBoolean(false) + val task = java.util.concurrent.FutureTask { + claimed.compareAndSet(false, true) && + (SystemKeyCapture.onKeyEvent(event) || HomeButtonShortcuts.onKeyEvent(this, event)) + } + main.postAtFrontOfQueue(task) + return try { + task.get(KEY_TIMEOUT_MS, java.util.concurrent.TimeUnit.MILLISECONDS) + } catch (e: java.util.concurrent.TimeoutException) { + if (claimed.compareAndSet(false, true)) false else runCatching { task.get() }.getOrDefault(false) + } catch (e: Exception) { + false + } + } + + override fun onCreate() { + super.onCreate() + getSystemService(InputManager::class.java).registerInputDeviceListener(this, main) + if (BottomScreenGuests.supported()) bottomScreen = BottomScreenWatch(this).also { it.start() } + } + + override fun onBind(intent: Intent?): IBinder = binder + + override fun onUnbind(intent: Intent?): Boolean { + HomeButtonShortcuts.release() + return super.onUnbind(intent) } - override fun onKeyEvent(event: KeyEvent) = - SystemKeyCapture.onKeyEvent(event) || HomeButtonShortcuts.onKeyEvent(this, event) - override fun onAccessibilityEvent(event: AccessibilityEvent?) { event?.let { bottomScreen?.onEvent(it) } } - override fun onInterrupt() { HomeButtonShortcuts.release() } override fun onInputDeviceAdded(deviceId: Int) {} override fun onInputDeviceChanged(deviceId: Int) {} override fun onInputDeviceRemoved(deviceId: Int) { HomeButtonShortcuts.onDeviceRemoved(deviceId) } - override fun onUnbind(intent: Intent?): Boolean { - HomeButtonShortcuts.release() - stopBottomScreen() - com.droiddeck.launcher.core.SteamIntegration.syncShortcutsListing(this) - return super.onUnbind(intent) - } - override fun onDestroy() { HomeButtonShortcuts.release() - stopBottomScreen() + bottomScreen?.stop() + bottomScreen = null getSystemService(InputManager::class.java).unregisterInputDeviceListener(this) super.onDestroy() } + + private companion object { + const val KEY_TIMEOUT_MS = 200L + } } diff --git a/app/src/main/java/com/droiddeck/launcher/update/SelfInstaller.kt b/app/src/main/java/com/droiddeck/launcher/update/SelfInstaller.kt index 5d1d33455c..7e0992433c 100644 --- a/app/src/main/java/com/droiddeck/launcher/update/SelfInstaller.kt +++ b/app/src/main/java/com/droiddeck/launcher/update/SelfInstaller.kt @@ -90,10 +90,11 @@ object SelfInstaller { } } - fun install(context: Context, apk: File, onSession: (Int) -> Unit = {}) { + fun install(context: Context, apk: File, packageName: String = context.packageName, action: String = ACTION_STATUS, + onSession: (Int) -> Unit = {}) { val installer = context.packageManager.packageInstaller val params = PackageInstaller.SessionParams(PackageInstaller.SessionParams.MODE_FULL_INSTALL).apply { - setAppPackageName(context.packageName) + setAppPackageName(packageName) setSize(apk.length()) if (Build.VERSION.SDK_INT >= 31) setRequireUserAction(PackageInstaller.SessionParams.USER_ACTION_NOT_REQUIRED) } @@ -105,7 +106,7 @@ object SelfInstaller { session.fsync(out) } } - val status = Intent(ACTION_STATUS).setPackage(context.packageName) + val status = Intent(action).setPackage(context.packageName) val flags = PendingIntent.FLAG_UPDATE_CURRENT or (if (Build.VERSION.SDK_INT >= 31) PendingIntent.FLAG_MUTABLE else 0) onSession(id) session.commit(PendingIntent.getBroadcast(context, id, status, flags).intentSender) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index c727bb56de..992d695689 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -3997,8 +3997,6 @@ يبقى Alt+Tab ومفتاح Win وزر الرئيسية داخل الجلسة غير متاح في Android؟ معلومات التطبيق → ⋮ → السماح بالإعدادات المحظورة محظور من Android · معلومات التطبيق → ⋮ → السماح بالإعدادات المحظورة - مفاتيح نظام DroidDeck - إبقاء Alt+Tab ومفتاح Win وزر الرئيسية داخل جلسة DroidDeck النشطة بدلاً من Android. فعّل «السطوع» من الإعداد → تكامل Steam جسر Mali: متوقف لا يمكن لـ %1$s استخدام جسر Mali (يحتاج إلى معالج رسوميات Mali من دون مسار لبرنامج تشغيل النظام)، لذا ليس لهذا المفتاح أي تأثير هنا. diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 4efea900f0..10db11b51f 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -3853,8 +3853,6 @@ Alt+Tab, la tecla Win y el botón Inicio se quedan en la sesión ¿Aparece en gris en Android? Información de la app → ⋮ → Permitir configuración restringida Bloqueado por Android · Información de la app → ⋮ → Permitir configuración restringida - Teclas del sistema de DroidDeck - Mantiene Alt+Tab, la tecla Win y el botón Inicio dentro de una sesión activa de DroidDeck en lugar de Android. Activa Brillo en Configuración → Integración con Steam Puente Mali: desactivado %1$s no puede usar el puente Mali (necesita una GPU Mali sin ruta de controlador del sistema), así que esta opción no tiene efecto aquí. diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 00e4828713..58dda3d3b6 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -3841,8 +3841,6 @@ Alt+Tab, клавишът Win и бутонът Начало остават в сесията Неактивно в Android? Информация за приложението → ⋮ → Разрешаване на ограничените настройки Блокирано от Android · Информация за приложението → ⋮ → Разрешаване на ограничените настройки - Системни клавиши на DroidDeck - Задържа Alt+Tab, клавиша Win и бутона Начало в активната сесия на DroidDeck вместо в Android. Включете „Яркост“ в Настройка → Интеграция със Steam Mali мост: изкл. %1$s не може да използва моста Mali (нужен е графичен процесор Mali без маршрут през системен драйвер), затова този превключвател няма ефект тук. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 4975ad28e9..d1177c7ec3 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -3919,8 +3919,6 @@ Alt+Tab, klávesa Win a tlačítko Domů zůstanou v relaci V Androidu zašedlé? Informace o aplikaci → ⋮ → Povolit omezená nastavení Blokováno Androidem · Informace o aplikaci → ⋮ → Povolit omezená nastavení - Systémové klávesy DroidDeck - Ponechá Alt+Tab, klávesu Win a tlačítko Domů v aktivní relaci DroidDeck místo Androidu. Zapněte Jas v Příprava → Integrace se Steamem Most Mali: vypnuto %1$s nemůže použít most Mali (potřebuje GPU Mali bez trasy přes systémový ovladač), takže tento přepínač tady nemá žádný účinek. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index f4e50fcf52..88d307fa30 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -3841,8 +3841,6 @@ Alt+Tab, Win-tasten og Hjem-knappen bliver i sessionen Nedtonet i Android? Appinfo → ⋮ → Tillad begrænsede indstillinger Blokeret af Android · Appinfo → ⋮ → Tillad begrænsede indstillinger - DroidDeck-systemtaster - Holder Alt+Tab, Win-tasten og Hjem-knappen i en aktiv DroidDeck-session i stedet for Android. Slå Lysstyrke til under Opsætning → Steam-integration Mali-bro: fra %1$s kan ikke bruge Mali-broen (den kræver en Mali-GPU uden en rute gennem systemdriveren), så denne kontakt har ingen virkning her. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 42b94372bb..8d3f2f61b1 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -3841,8 +3841,6 @@ Alt+Tab, Win-Taste und Home-Taste bleiben in der Sitzung In Android ausgegraut? App-Info → ⋮ → Eingeschränkte Einstellungen zulassen Von Android blockiert · App-Info → ⋮ → Eingeschränkte Einstellungen zulassen - DroidDeck-Systemtasten - Hält Alt+Tab, die Win-Taste und die Home-Taste in einer aktiven DroidDeck-Sitzung statt bei Android. Aktiviere Helligkeit unter Einrichtung → Steam-Integration Mali-Brücke: aus %1$s kann die Mali-Brücke nicht nutzen (sie benötigt eine Mali-GPU ohne Systemtreiber-Route), daher hat dieser Schalter hier keine Wirkung. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index b134c56bd3..d47290edfc 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -3841,8 +3841,6 @@ Τα Alt+Tab, Win και Αρχική μένουν στη συνεδρία Γκρίζο στο Android; Πληροφορίες εφαρμογής → ⋮ → Να επιτρέπονται οι περιορισμένες ρυθμίσεις Αποκλείεται από το Android · Πληροφορίες εφαρμογής → ⋮ → Να επιτρέπονται οι περιορισμένες ρυθμίσεις - Πλήκτρα συστήματος DroidDeck - Διατηρεί τα Alt+Tab, το πλήκτρο Win και το κουμπί Αρχικής στην ενεργή συνεδρία DroidDeck αντί για το Android. Ενεργοποιήστε τη Φωτεινότητα στη Ρύθμιση → Ενσωμάτωση Steam Γέφυρα Mali: ανενεργή Το %1$s δεν μπορεί να χρησιμοποιήσει τη γέφυρα Mali (χρειάζεται GPU Mali χωρίς διαδρομή οδηγού συστήματος), επομένως αυτός ο διακόπτης δεν έχει καμία επίδραση εδώ. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index ab98f22cf8..5c6e215cf2 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -3880,8 +3880,6 @@ Alt+Tab, la tecla Win y el botón Inicio se quedan en la sesión ¿Aparece en gris en Android? Información de la aplicación → ⋮ → Permitir ajustes restringidos Bloqueado por Android · Información de la aplicación → ⋮ → Permitir ajustes restringidos - Teclas del sistema de DroidDeck - Mantiene Alt+Tab, la tecla Win y el botón Inicio en una sesión activa de DroidDeck en lugar de Android. Activa Brillo en Configuración → Integración con Steam Puente Mali: desactivado %1$s no puede usar el puente Mali (necesita una GPU Mali sin ruta de controlador del sistema), así que este interruptor no tiene efecto aquí. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 682c4eeeef..768f51c4ec 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -3841,8 +3841,6 @@ Alt+Tab, Win-näppäin ja Koti-painike pysyvät istunnossa Harmaana Androidissa? Sovelluksen tiedot → ⋮ → Salli rajoitetut asetukset Androidin estämä · Sovelluksen tiedot → ⋮ → Salli rajoitetut asetukset - DroidDeckin järjestelmänäppäimet - Pitää Alt+Tabin, Win-näppäimen ja Koti-painikkeen aktiivisessa DroidDeck-istunnossa Androidin sijaan. Ota Kirkkaus käyttöön kohdassa Käyttöönotto → Steam-integraatio Mali-silta: pois %1$s ei voi käyttää Mali-siltaa (se vaatii Mali-GPU:n, jolla ei ole järjestelmäajurireittiä), joten tällä kytkimellä ei ole vaikutusta tässä. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index f0aaf7dae6..7d9c40c4aa 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -3879,8 +3879,6 @@ Alt+Tab, la touche Win et le bouton Accueil restent dans la session Grisé dans Android ? Infos sur l\'appli → ⋮ → Autoriser les paramètres restreints Bloqué par Android · Infos sur l\'appli → ⋮ → Autoriser les paramètres restreints - Touches système DroidDeck - Garde Alt+Tab, la touche Win et le bouton Accueil dans une session DroidDeck active plutôt que dans Android. Activez Luminosité dans Paramètres → Intégration Steam Pont Mali : désactivé %1$s ne peut pas utiliser le pont Mali (il faut un GPU Mali sans route de pilote système) ; ce commutateur n\'a donc aucun effet ici. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 6aa2f1b3c2..60e7689262 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -3841,8 +3841,6 @@ Alt+Tab, Win कुंजी और होम बटन सत्र में ही रहते हैं Android में धूसर है? ऐप्लिकेशन की जानकारी → ⋮ → प्रतिबंधित सेटिंग की अनुमति दें Android ने ब्लॉक किया · ऐप्लिकेशन की जानकारी → ⋮ → प्रतिबंधित सेटिंग की अनुमति दें - DroidDeck सिस्टम कुंजियाँ - Alt+Tab, Win कुंजी और होम बटन को Android के बजाय सक्रिय DroidDeck सत्र में रखता है। Setup → Steam इंटीग्रेशन में ब्राइटनेस चालू करें Mali ब्रिज: बंद %1$s Mali ब्रिज इस्तेमाल नहीं कर सकता (इसे ऐसा Mali GPU चाहिए जिसके पास सिस्टम ड्राइवर का रास्ता न हो), इसलिए यहाँ इस स्विच का कोई असर नहीं है। diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 5b7efc62c4..b025ef406a 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -3841,8 +3841,6 @@ Az Alt+Tab, a Win billentyű és a Kezdőlap gomb a munkamenetben marad Szürke az Androidban? Alkalmazásinformáció → ⋮ → Korlátozott beállítások engedélyezése Az Android letiltotta · Alkalmazásinformáció → ⋮ → Korlátozott beállítások engedélyezése - DroidDeck rendszerbillentyűk - Az Alt+Tab, a Win billentyű és a Kezdőlap gomb az aktív DroidDeck-munkamenetben marad az Android helyett. Kapcsolja be a Fényerőt itt: Beállítás → Steam-integráció Mali híd: ki %1$s nem használhatja a Mali hidat (ehhez olyan Mali GPU kell, amelyhez nincs rendszer-illesztőprogramos útvonal), ezért ennek a kapcsolónak itt nincs hatása. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 12c28892e3..7d67d8cac3 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -3812,8 +3812,6 @@ Alt+Tab, tombol Win, dan tombol Beranda tetap di sesi Berwarna abu-abu di Android? Info aplikasi → ⋮ → Izinkan setelan terbatas Diblokir oleh Android · Info aplikasi → ⋮ → Izinkan setelan terbatas - Tombol sistem DroidDeck - Menjaga Alt+Tab, tombol Win, dan tombol Beranda tetap di sesi DroidDeck yang aktif, bukan di Android. Aktifkan Kecerahan di Penyiapan → Integrasi Steam Jembatan Mali: mati %1$s tidak dapat menggunakan jembatan Mali (jembatan ini membutuhkan GPU Mali tanpa jalur driver sistem), sehingga sakelar ini tidak berpengaruh di sini. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 3c830c5560..4568abf3ff 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -3879,8 +3879,6 @@ Alt+Tab, tasto Win e tasto Home restano nella sessione Disattivato in grigio su Android? Informazioni app → ⋮ → Consenti impostazioni con limitazioni Bloccato da Android · Informazioni app → ⋮ → Consenti impostazioni con limitazioni - Tasti di sistema DroidDeck - Mantiene Alt+Tab, il tasto Win e il tasto Home in una sessione DroidDeck attiva anziché in Android. Attiva Luminosità in Configurazione → Integrazione con Steam Ponte Mali: disattivato %1$s non può usare il bridge Mali (richiede una GPU Mali senza un percorso tramite driver di sistema), quindi questo interruttore non ha effetto qui. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index cf673d8800..76e35f64ab 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -3812,8 +3812,6 @@ Alt+Tab、Win キー、ホームボタンをセッション内で使えます Androidでグレー表示されていますか?アプリ情報 → ⋮ → 制限付き設定を許可 Androidによってブロックされています · アプリ情報 → ⋮ → 制限付き設定を許可 - DroidDeck システムキー - Alt+Tab、Win キー、ホームボタンを Android ではなく操作中の DroidDeck セッションで使えるようにします。 「セットアップ」→「Steam連携」で明るさをオンにしてください Mali ブリッジ: オフ %1$s では Mali ブリッジを使用できません(システムドライバーの経路が存在しない Mali GPU が必要です)。そのため、このスイッチはここでは効果がありません。 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 558894cf18..2ffee73e7a 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -3812,8 +3812,6 @@ Alt+Tab, Win 키, 홈 버튼이 세션 안에서 작동합니다 Android에서 회색으로 표시되나요? 앱 정보 → ⋮ → 제한된 설정 허용 Android에서 차단됨 · 앱 정보 → ⋮ → 제한된 설정 허용 - DroidDeck 시스템 키 - Alt+Tab, Win 키, 홈 버튼을 Android 대신 사용 중인 DroidDeck 세션에서 작동하게 합니다. 설정 → Steam 연동에서 밝기를 켜세요 Mali 브리지: 끔 Mali 브리지에는 시스템 드라이버 경로가 없는 Mali GPU가 필요하므로 %1$s에서는 사용할 수 없으며, 이 스위치는 여기서 아무 효과가 없습니다. diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index fc2b93e758..66a06f456e 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -3812,8 +3812,6 @@ Alt+Tab, kekunci Win dan butang Utama kekal dalam sesi Dikelabukan dalam Android? Maklumat apl → ⋮ → Benarkan tetapan terhad Disekat oleh Android · Maklumat apl → ⋮ → Benarkan tetapan terhad - Kekunci sistem DroidDeck - Mengekalkan Alt+Tab, kekunci Win dan butang Utama dalam sesi DroidDeck yang aktif, bukan Android. Hidupkan Kecerahan dalam Persediaan → Integrasi Steam Jambatan Mali: mati %1$s tidak boleh menggunakan jambatan Mali (jambatan itu memerlukan GPU Mali tanpa laluan pemandu sistem), jadi suis ini tidak memberi kesan di sini. diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 2d071b6811..6db23a553b 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -3841,8 +3841,6 @@ Alt+Tab, Win-tasten og Hjem-knappen blir i økten Nedtonet i Android? Appinfo → ⋮ → Tillat begrensede innstillinger Blokkert av Android · Appinfo → ⋮ → Tillat begrensede innstillinger - DroidDeck-systemtaster - Holder Alt+Tab, Win-tasten og Hjem-knappen i en aktiv DroidDeck-økt i stedet for Android. Slå på Lysstyrke i Oppsett → Steam-integrering Mali-bro: av %1$s kan ikke bruke Mali-broen (den krever en Mali-GPU uten en rute via systemdriveren), så denne bryteren har ingen effekt her. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 2ed2805c76..b4382a1fe2 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -3841,8 +3841,6 @@ Alt+Tab, Win-toets en Home-knop blijven in de sessie Grijs in Android? App-info → ⋮ → Beperkte instellingen toestaan Geblokkeerd door Android · App-info → ⋮ → Beperkte instellingen toestaan - DroidDeck-systeemtoetsen - Houdt Alt+Tab, de Win-toets en de Home-knop in een actieve DroidDeck-sessie in plaats van Android. Zet Helderheid aan in Installatie → Steam-integratie Mali-brug: uit %1$s kan de Mali-brug niet gebruiken (die heeft een Mali-GPU nodig zonder route via de systeemdriver), dus deze schakelaar heeft hier geen effect. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 9c9baa4442..131d806446 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -3919,8 +3919,6 @@ Alt+Tab, klawisz Win i przycisk Home pozostają w sesji Wyszarzone w Androidzie? Informacje o aplikacji → ⋮ → Zezwól na ustawienia z ograniczeniami Zablokowane przez Androida · Informacje o aplikacji → ⋮ → Zezwól na ustawienia z ograniczeniami - Klawisze systemowe DroidDeck - Zatrzymuje Alt+Tab, klawisz Win i przycisk Home w aktywnej sesji DroidDeck zamiast w Androidzie. Włącz Jasność w Konfiguracja → Integracja ze Steam Most Mali: wył. %1$s nie może używać mostku Mali (wymaga GPU Mali bez ścieżki sterownika systemowego), więc ten przełącznik nic tu nie zmienia. diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index ce3be30b49..ade7385208 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -3879,8 +3879,6 @@ Alt+Tab, tecla Win e botão Início ficam na sessão Desativado a cinzento no Android? Informações da aplicação → ⋮ → Permitir definições restritas Bloqueado pelo Android · Informações da aplicação → ⋮ → Permitir definições restritas - Teclas do sistema DroidDeck - Mantém Alt+Tab, a tecla Win e o botão Início numa sessão ativa do DroidDeck em vez do Android. Ative Brilho em Configuração → Integração com o Steam Ponte Mali: desligada %1$s não pode usar a ponte Mali (é necessária uma GPU Mali sem rota de controlador do sistema), por isso este interruptor não tem efeito aqui. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 7f57fcfecf..dfaaac307f 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -3887,8 +3887,6 @@ Alt+Tab, tecla Win e botão Início ficam na sessão Esmaecido no Android? Informações do app → ⋮ → Permitir configurações restritas Bloqueado pelo Android · Informações do app → ⋮ → Permitir configurações restritas - Teclas do sistema DroidDeck - Mantém Alt+Tab, a tecla Win e o botão Início em uma sessão ativa do DroidDeck em vez do Android. Ative Brilho em Configuração → Integração com a Steam Ponte Mali: desligada %1$s não pode usar a ponte Mali (ela precisa de uma GPU Mali sem uma rota de driver do sistema), por isso esta chave não tem efeito aqui. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 753a09a44c..6260325350 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -3880,8 +3880,6 @@ Alt+Tab, tasta Win și butonul Acasă rămân în sesiune Inactiv în Android? Informații despre aplicație → ⋮ → Permite setările restricționate Blocat de Android · Informații despre aplicație → ⋮ → Permite setările restricționate - Taste de sistem DroidDeck - Păstrează Alt+Tab, tasta Win și butonul Acasă într-o sesiune DroidDeck activă în loc de Android. Activează Luminozitate în Configurare → Integrare Steam Punte Mali: oprită %1$s nu poate folosi puntea Mali (are nevoie de un GPU Mali fără o rută prin driverul de sistem), deci acest comutator nu are niciun efect aici. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index f2a009ca15..87fb246084 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -3919,8 +3919,6 @@ Alt+Tab, клавиша Win и кнопка «Домой» работают в сеансе Неактивно в Android? «О приложении» → ⋮ → «Разрешить доступ к настройкам с ограниченным доступом» Заблокировано Android · «О приложении» → ⋮ → «Разрешить доступ к настройкам с ограниченным доступом» - Системные клавиши DroidDeck - Оставляет Alt+Tab, клавишу Win и кнопку «Домой» в активном сеансе DroidDeck, а не в Android. Включите «Яркость» в «Настройка → Интеграция со Steam» Мост Mali: выкл. %1$s не может использовать мост Mali (для него нужен GPU Mali без маршрута через системный драйвер), поэтому этот переключатель здесь ни на что не влияет. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 34a9af51a3..bc4054c3a5 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -3841,8 +3841,6 @@ Alt+Tab, Win-tangenten och Hem-knappen stannar i sessionen Nedtonat i Android? Appinfo → ⋮ → Tillåt begränsade inställningar Blockerat av Android · Appinfo → ⋮ → Tillåt begränsade inställningar - DroidDeck-systemtangenter - Håller Alt+Tab, Win-tangenten och Hem-knappen i en aktiv DroidDeck-session i stället för Android. Slå på Ljusstyrka under Konfiguration → Steam-integration Mali-brygga: av %1$s kan inte använda Mali-bryggan (den kräver en Mali-GPU utan en väg via systemdrivrutinen), så det här reglaget har ingen effekt här. diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index c582fb2d9c..ac923b3b5c 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -3812,8 +3812,6 @@ Alt+Tab ปุ่ม Win และปุ่มโฮมทำงานในเซสชัน เป็นสีเทาใน Android? ข้อมูลแอป → ⋮ → อนุญาตการตั้งค่าที่จำกัด ถูกบล็อกโดย Android · ข้อมูลแอป → ⋮ → อนุญาตการตั้งค่าที่จำกัด - ปุ่มระบบของ DroidDeck - ให้ Alt+Tab ปุ่ม Win และปุ่มโฮมทำงานในเซสชัน DroidDeck ที่ใช้งานอยู่แทน Android เปิดความสว่างในการตั้งค่า → การผสานรวม Steam บริดจ์ Mali: ปิด %1$s ใช้บริดจ์ Mali ไม่ได้ (ต้องการ GPU Mali ที่ยังไม่มีเส้นทางไดรเวอร์ระบบ) สวิตช์นี้จึงไม่มีผลบนเครื่องนี้ diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 091423dc4d..7327d5d360 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -3841,8 +3841,6 @@ Alt+Tab, Win tuşu ve Ana Ekran düğmesi oturumda kalır Android\'de gri mi görünüyor? Uygulama bilgileri → ⋮ → Kısıtlanmış ayarlara izin ver Android tarafından engellendi · Uygulama bilgileri → ⋮ → Kısıtlanmış ayarlara izin ver - DroidDeck sistem tuşları - Alt+Tab, Win tuşu ve Ana Ekran düğmesini Android yerine etkin DroidDeck oturumunda tutar. Kurulum → Steam entegrasyonu bölümünde Parlaklık\'ı açın Mali köprüsü: kapalı %1$s Mali köprüsünü kullanamaz (sistem sürücüsü yolu olmayan bir Mali GPU gerekir), bu yüzden bu anahtarın burada etkisi yok. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 12a675a0be..1f8bd0c763 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -3919,8 +3919,6 @@ Alt+Tab, клавіша Win і кнопка «Додому» працюють у сеансі Неактивно в Android? «Про додаток» → ⋮ → «Дозволити обмежені налаштування» Заблоковано Android · «Про додаток» → ⋮ → «Дозволити обмежені налаштування» - Системні клавіші DroidDeck - Залишає Alt+Tab, клавішу Win і кнопку «Додому» в активному сеансі DroidDeck, а не в Android. Увімкніть «Яскравість» у «Налаштування → Інтеграція зі Steam» Міст Mali: вимк. %1$s не може використовувати міст Mali (для цього потрібен GPU Mali без маршруту через системний драйвер), тому цей перемикач тут не діє. diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index ee8dfd4c49..7393226832 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -3812,8 +3812,6 @@ Alt+Tab, phím Win và nút Trang chủ giữ trong phiên Bị làm mờ trong Android? Thông tin ứng dụng → ⋮ → Cho phép chế độ cài đặt bị hạn chế Bị Android chặn · Thông tin ứng dụng → ⋮ → Cho phép chế độ cài đặt bị hạn chế - Phím hệ thống DroidDeck - Giữ Alt+Tab, phím Win và nút Trang chủ trong phiên DroidDeck đang dùng thay vì Android. Bật Độ sáng trong Thiết lập → Tích hợp Steam Cầu Mali: tắt %1$s không thể dùng cầu nối Mali (cần GPU Mali không có đường dẫn qua trình điều khiển hệ thống), nên công tắc này không có tác dụng ở đây. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index c8bbecff77..57b2b1e337 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -3812,8 +3812,6 @@ Alt+Tab、Win 键和主页键留在会话中 在 Android 中显示为灰色?应用信息 → ⋮ → 允许受限设置 已被 Android 阻止 · 应用信息 → ⋮ → 允许受限设置 - DroidDeck 系统按键 - 让 Alt+Tab、Win 键和主页键在当前 DroidDeck 会话中生效,而不是交给 Android。 请在“配置”→“Steam 集成”中开启亮度 DXVK DXVK:自动 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index a0632feceb..83dec94279 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -3809,8 +3809,6 @@ Alt+Tab、Win 鍵和主頁鍵留在工作階段中 在 Android 中呈灰色?應用程式資訊 → ⋮ → 允許受限制的設定 已被 Android 封鎖 · 應用程式資訊 → ⋮ → 允許受限制的設定 - DroidDeck 系統按鍵 - 讓 Alt+Tab、Win 鍵和主頁鍵在目前的 DroidDeck 工作階段中生效,而不是交給 Android。 請在「初始設定 → Steam 整合」中開啟「亮度」 DXVK DXVK:自動 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 3dd5aa0655..13721764f1 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -3809,8 +3809,6 @@ Alt+Tab、Win 鍵和主畫面鍵留在工作階段中 在 Android 中呈灰色?應用程式資訊 → ⋮ → 允許受限制的設定 已被 Android 封鎖 · 應用程式資訊 → ⋮ → 允許受限制的設定 - DroidDeck 系統按鍵 - 讓 Alt+Tab、Win 鍵和主畫面鍵在目前的 DroidDeck 工作階段中生效,而不是交給 Android。 請在「初始設定 → Steam 整合」中開啟「亮度」 DXVK DXVK:自動 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e0553b82eb..d0c2f4d83e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4010,9 +4010,9 @@ Home opens the Steam menu in a session Alt+Tab, Win key and Home button stay in the session Greyed out in Android? App info → ⋮ → Allow restricted settings + System keys didn\'t install + System keys didn\'t install: %1$s Blocked by Android · App info → ⋮ → Allow restricted settings - DroidDeck system keys - Keep Alt+Tab, the Win key and the Home button inside a focused DroidDeck session instead of Android. Turn on Brightness in Setup → Steam integration Restoring your software Reinstalling the apps you added after a DroidDeck update. diff --git a/app/src/test/java/com/droiddeck/launcher/core/SteamIntegrationShortcutsTest.kt b/app/src/test/java/com/droiddeck/launcher/core/SteamIntegrationShortcutsTest.kt deleted file mode 100644 index 961d3d25ab..0000000000 --- a/app/src/test/java/com/droiddeck/launcher/core/SteamIntegrationShortcutsTest.kt +++ /dev/null @@ -1,97 +0,0 @@ -package com.droiddeck.launcher.core - -import android.app.Application -import android.content.ComponentName -import android.content.Intent -import android.content.pm.PackageManager -import android.provider.Settings -import androidx.test.core.app.ApplicationProvider -import com.droiddeck.launcher.input.HomeButtonService -import org.junit.Assert.assertEquals -import org.junit.Assert.assertFalse -import org.junit.Assert.assertTrue -import org.junit.Test -import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config - -@RunWith(RobolectricTestRunner::class) -@Config(sdk = [33], application = Application::class) -class SteamIntegrationShortcutsTest { - private val context: Application = ApplicationProvider.getApplicationContext() - private val service = ComponentName(context, HomeButtonService::class.java) - - private fun listed() = context.packageManager.queryIntentServices( - Intent("android.accessibilityservice.AccessibilityService").setPackage(context.packageName), 0, - ).any { ComponentName(it.serviceInfo.packageName, it.serviceInfo.name) == service } - - private fun choose(value: String?) = - Settings.Secure.putString(context.contentResolver, Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES, value) - - @Test fun theShortcutsServiceIsHiddenUntilChosen() { - assertTrue(listed()) - assertFalse(SteamIntegration.shortcutsChosen(context)) - SteamIntegration.syncShortcutsListing(context) - assertFalse(listed()) - assertEquals(PackageManager.COMPONENT_ENABLED_STATE_DISABLED, context.packageManager.getComponentEnabledSetting(service)) - } - - @Test fun anUpdateKeepsAServiceTheUserAlreadyTurnedOn() { - choose(service.flattenToString()) - SteamIntegration.syncShortcutsListing(context) - assertTrue(listed()) - assertTrue(SteamIntegration.shortcutsChosen(context)) - } - - @Test fun openingShortcutSetupListsTheServiceAndBackingOutHidesItAgain() { - SteamIntegration.setShortcutsListed(context, true) - assertTrue(listed()) - SteamIntegration.syncShortcutsListing(context) - assertFalse(listed()) - assertEquals(PackageManager.COMPONENT_ENABLED_STATE_DISABLED, context.packageManager.getComponentEnabledSetting(service)) - } - - @Test fun aChosenServiceStaysListed() { - choose("other.app/.Reader:" + service.flattenToShortString()) - assertTrue(SteamIntegration.shortcutsChosen(context)) - SteamIntegration.syncShortcutsListing(context) - assertTrue(listed()) - choose(service.flattenToString()) - assertTrue(SteamIntegration.shortcutsChosen(context)) - choose("other.app/.Reader") - assertFalse(SteamIntegration.shortcutsChosen(context)) - SteamIntegration.syncShortcutsListing(context) - assertFalse(listed()) - } - - @Test fun anUpdateHidesAnUnchosenServiceWithoutOpeningDroidDeck() { - val replaced = Intent(Intent.ACTION_MY_PACKAGE_REPLACED).setPackage(context.packageName) - assertTrue(context.packageManager.queryBroadcastReceivers(replaced, 0) - .any { it.activityInfo.name == ShortcutsListingReceiver::class.java.name }) - assertTrue(listed()) - ShortcutsListingReceiver().onReceive(context, replaced) - assertFalse(listed()) - } - - @Test fun anUpdateLeavesAChosenServiceListed() { - choose(service.flattenToString()) - ShortcutsListingReceiver().onReceive(context, Intent(Intent.ACTION_MY_PACKAGE_REPLACED)) - assertTrue(listed()) - assertTrue(SteamIntegration.shortcutsChosen(context)) - } - - @Test fun otherBroadcastsChangeNothing() { - ShortcutsListingReceiver().onReceive(context, Intent(Intent.ACTION_BOOT_COMPLETED)) - assertTrue(listed()) - } - - @Test fun turningTheServiceOffInSettingsHidesItAtOnce() { - choose(service.flattenToString()) - val running = org.robolectric.Robolectric.buildService(HomeButtonService::class.java).create().get() - running.onUnbind(null) - assertTrue(listed()) - choose("") - running.onUnbind(null) - assertFalse(listed()) - } -} diff --git a/app/src/test/java/com/droiddeck/launcher/input/ShortcutsRelayTest.kt b/app/src/test/java/com/droiddeck/launcher/input/ShortcutsRelayTest.kt new file mode 100644 index 0000000000..2a8d99cd81 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/ShortcutsRelayTest.kt @@ -0,0 +1,98 @@ +package com.droiddeck.launcher.input + +import android.app.Application +import android.content.Intent +import android.content.pm.ApplicationInfo +import android.content.pm.PackageInfo +import android.graphics.Rect +import android.os.IBinder +import android.os.Parcel +import android.provider.Settings +import androidx.test.core.app.ApplicationProvider +import com.droiddeck.launcher.core.SteamIntegration +import com.droiddeck.shortcuts.Relay +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +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.shadows.ShadowBinder + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33], application = Application::class) +class ShortcutsRelayTest { + private val context: Application = ApplicationProvider.getApplicationContext() + private val companionUid = 10_999 + + private fun choose(value: String?) = + Settings.Secure.putString(context.contentResolver, Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES, value) + + private fun installCompanion() { + val app = ApplicationInfo().apply { packageName = Relay.PACKAGE; uid = companionUid } + shadowOf(context.packageManager).installPackage(PackageInfo().apply { packageName = Relay.PACKAGE; applicationInfo = app }) + shadowOf(context.packageManager).setPackagesForUid(companionUid, Relay.PACKAGE) + } + + private fun config(binder: IBinder, uid: Int): Int? { + val data = Parcel.obtain() + val reply = Parcel.obtain() + try { + data.writeInterfaceToken(Relay.DESCRIPTOR) + ShadowBinder.setCallingUid(uid) + if (!binder.transact(Relay.CONFIG, data, reply, 0)) return null + reply.setDataPosition(0) + return reply.readInt() + } finally { + ShadowBinder.reset() + data.recycle() + reply.recycle() + } + } + + @Test fun droidDeckDeclaresNoAccessibilityService() { + val services = context.packageManager.queryIntentServices( + Intent("android.accessibilityservice.AccessibilityService").setPackage(context.packageName), 0) + assertTrue(services.isEmpty()) + } + + @Test fun theCompanionFindsTheRelay() { + val relays = context.packageManager.queryIntentServices(Intent(Relay.ACTION).setPackage(context.packageName), 0) + assertEquals(listOf(ShortcutsRelay::class.java.name), relays.map { it.serviceInfo.name }) + } + + @Test fun shortcutsAreOnOnlyWhileTheCompanionServiceIsEnabled() { + assertFalse(SteamIntegration.shortcutsEnabled(context)) + choose("other.app/.Reader:${Relay.PACKAGE}/${Relay.SERVICE}") + assertTrue(SteamIntegration.shortcutsEnabled(context)) + choose("${Relay.PACKAGE}/.ShortcutsService") + assertTrue(SteamIntegration.shortcutsEnabled(context)) + choose("other.app/.Reader") + assertFalse(SteamIntegration.shortcutsEnabled(context)) + } + + @Test fun theRelayAnswersOnlyTheEnabledCompanion() { + installCompanion() + val binder = Robolectric.buildService(ShortcutsRelay::class.java).create().get().onBind(Intent(Relay.ACTION)) + assertNull(config(binder, companionUid)) + choose("${Relay.PACKAGE}/${Relay.SERVICE}") + assertNull(config(binder, 10_998)) + assertEquals(0, config(binder, companionUid)) + } + + @Test fun windowSnapshotsSurviveTheTrip() { + val sent = mapOf(2 to listOf(Relay.Window(7, 1, 3, Rect(0, 0, 1080, 1240), "guest.app"), Relay.Window(8, 2, 1, Rect(1, 2, 3, 4), null))) + val got = Relay.decode(Relay.encode(sent)) + assertEquals(setOf(2), got.keys) + val windows = got.getValue(2) + assertEquals(listOf(7, 8), windows.map { it.id }) + assertEquals(listOf(1, 2), windows.map { it.type }) + assertEquals(listOf(3, 1), windows.map { it.layer }) + assertEquals(listOf(Rect(0, 0, 1080, 1240), Rect(1, 2, 3, 4)), windows.map { it.bounds }) + assertEquals(listOf("guest.app", null), windows.map { it.pkg }) + } +} diff --git a/settings.gradle b/settings.gradle index d614864989..6abc4f6609 100644 --- a/settings.gradle +++ b/settings.gradle @@ -15,4 +15,4 @@ dependencyResolutionManagement { } rootProject.name = "DroidDeck" -include ':app' +include ':app', ':shortcuts' diff --git a/shortcuts/build.gradle b/shortcuts/build.gradle new file mode 100644 index 0000000000..b9e37dd89d --- /dev/null +++ b/shortcuts/build.gradle @@ -0,0 +1,48 @@ +plugins { + id 'com.android.application' +} + +android { + namespace 'com.droiddeck.shortcuts' + compileSdk 34 + + defaultConfig { + applicationId 'com.droiddeck.shortcuts' + minSdkVersion 26 + targetSdkVersion 28 + versionCode 1 + versionName '1' + } + + sourceSets.main.java.srcDir('src/protocol/java') + + signingConfigs { + testkey { + storeFile file("${rootDir}/keystore/testkey.p12") + storeType 'PKCS12' + storePassword 'android' + keyAlias 'testkey' + keyPassword 'android' + enableV1Signing = true + enableV2Signing = true + enableV3Signing = true + } + } + + buildTypes { + debug { signingConfig signingConfigs.testkey } + release { + minifyEnabled false + signingConfig signingConfigs.testkey + } + } + + lint { + disable 'ExpiredTargetSdkVersion' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } +} diff --git a/shortcuts/src/main/AndroidManifest.xml b/shortcuts/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..2409846f7b --- /dev/null +++ b/shortcuts/src/main/AndroidManifest.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/shortcuts/src/main/java/com/droiddeck/shortcuts/ShortcutsService.java b/shortcuts/src/main/java/com/droiddeck/shortcuts/ShortcutsService.java new file mode 100644 index 0000000000..67410a3103 --- /dev/null +++ b/shortcuts/src/main/java/com/droiddeck/shortcuts/ShortcutsService.java @@ -0,0 +1,254 @@ +package com.droiddeck.shortcuts; + +import android.accessibilityservice.AccessibilityService; +import android.accessibilityservice.AccessibilityServiceInfo; +import android.content.BroadcastReceiver; +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.content.IntentFilter; +import android.content.ServiceConnection; +import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; +import android.graphics.Rect; +import android.os.Build; +import android.os.Handler; +import android.os.HandlerThread; +import android.os.IBinder; +import android.os.Parcel; +import android.os.RemoteException; +import android.util.SparseArray; +import android.view.Display; +import android.view.KeyEvent; +import android.view.accessibility.AccessibilityEvent; +import android.view.accessibility.AccessibilityNodeInfo; +import android.view.accessibility.AccessibilityWindowInfo; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CopyOnWriteArrayList; + +public class ShortcutsService extends AccessibilityService { + private final CopyOnWriteArrayList links = new CopyOnWriteArrayList<>(); + private HandlerThread windowsThread; + private Handler windows; + private boolean watchingWindows; + private boolean receiving; + private final Runnable snapshot = this::sendWindows; + + private final BroadcastReceiver packages = new BroadcastReceiver() { + @Override public void onReceive(Context context, Intent intent) { bindAll(); } + }; + + private final class Link implements ServiceConnection { + final ComponentName component; + volatile IBinder binder; + volatile int flags; + + Link(ComponentName component) { this.component = component; } + + @Override public void onServiceConnected(ComponentName name, IBinder service) { + binder = service; + flags = config(service); + if ((flags & Relay.WANTS_WINDOWS) != 0) watchWindows(); + } + + @Override public void onServiceDisconnected(ComponentName name) { binder = null; } + + @Override public void onBindingDied(ComponentName name) { drop(this); bindAll(); } + + @Override public void onNullBinding(ComponentName name) { drop(this); } + } + + @Override + protected void onServiceConnected() { + windowsThread = new HandlerThread("shortcuts-windows"); + windowsThread.start(); + windows = new Handler(windowsThread.getLooper()); + IntentFilter filter = new IntentFilter(); + filter.addAction(Intent.ACTION_PACKAGE_ADDED); + filter.addAction(Intent.ACTION_PACKAGE_REPLACED); + filter.addDataScheme("package"); + registerReceiver(packages, filter); + receiving = true; + bindAll(); + } + + private void bindAll() { + List found = getPackageManager().queryIntentServices(new Intent(Relay.ACTION), 0); + for (ResolveInfo info : found) { + // Keys and window contents only go to a relay signed with the same key as this companion. + if (getPackageManager().checkSignatures(getPackageName(), info.serviceInfo.packageName) + != PackageManager.SIGNATURE_MATCH) continue; + ComponentName component = new ComponentName(info.serviceInfo.packageName, info.serviceInfo.name); + boolean linked = false; + for (Link link : links) if (link.component.equals(component)) linked = true; + if (linked) continue; + Link link = new Link(component); + try { + if (bindService(new Intent(Relay.ACTION).setComponent(component), link, Context.BIND_AUTO_CREATE)) links.add(link); + else unbindService(link); + } catch (RuntimeException ignored) { + } + } + } + + private void drop(Link link) { + links.remove(link); + try { unbindService(link); } catch (RuntimeException ignored) {} + } + + private static int config(IBinder binder) { + Parcel data = Parcel.obtain(); + Parcel reply = Parcel.obtain(); + try { + data.writeInterfaceToken(Relay.DESCRIPTOR); + binder.transact(Relay.CONFIG, data, reply, 0); + return reply.readInt(); + } catch (RemoteException | RuntimeException e) { + return 0; + } finally { + data.recycle(); + reply.recycle(); + } + } + + private void watchWindows() { + if (Build.VERSION.SDK_INT < 30) return; + if (!watchingWindows) { + watchingWindows = true; + AccessibilityServiceInfo info = getServiceInfo(); + if (info != null) { + info.eventTypes |= AccessibilityEvent.TYPE_WINDOWS_CHANGED | AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED; + info.flags |= AccessibilityServiceInfo.FLAG_RETRIEVE_INTERACTIVE_WINDOWS; + setServiceInfo(info); + } + } + windows.removeCallbacks(snapshot); + windows.post(snapshot); + } + + @Override + protected boolean onKeyEvent(KeyEvent event) { + boolean taken = false; + for (Link link : links) { + IBinder binder = link.binder; + if (binder == null) continue; + Parcel data = Parcel.obtain(); + Parcel reply = Parcel.obtain(); + try { + data.writeInterfaceToken(Relay.DESCRIPTOR); + event.writeToParcel(data, 0); + binder.transact(Relay.KEY, data, reply, 0); + if (reply.readInt() != 0) taken = true; + } catch (RemoteException | RuntimeException ignored) { + } finally { + data.recycle(); + reply.recycle(); + } + } + return taken; + } + + @Override + public void onAccessibilityEvent(AccessibilityEvent event) { + if (!watchingWindows || event == null || Build.VERSION.SDK_INT < 30) return; + int type = event.getEventType(); + if (type == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED) { + CharSequence pkg = event.getPackageName(); + int display = event.getDisplayId(); + if (pkg == null || display == Display.DEFAULT_DISPLAY) return; + String name = pkg.toString(); + long at = event.getEventTime(); + sendAll(Relay.ARRIVAL, data -> { + data.writeInt(display); + data.writeString(name); + data.writeLong(at); + }); + } else if (type != AccessibilityEvent.TYPE_WINDOWS_CHANGED) { + return; + } + windows.removeCallbacks(snapshot); + windows.postDelayed(snapshot, 150); + } + + private void sendWindows() { + if (Build.VERSION.SDK_INT < 30) return; + SparseArray> all; + try { all = getWindowsOnAllDisplays(); } catch (RuntimeException e) { return; } + Map> displays = new LinkedHashMap<>(); + for (int i = 0; i < all.size(); i++) { + if (all.keyAt(i) == Display.DEFAULT_DISPLAY) continue; + List windows = new ArrayList<>(); + for (AccessibilityWindowInfo window : all.valueAt(i)) { + Rect bounds = new Rect(); + window.getBoundsInScreen(bounds); + windows.add(new Relay.Window(window.getId(), window.getType(), window.getLayer(), bounds, packageOf(window))); + } + displays.put(all.keyAt(i), windows); + } + byte[] bytes = Relay.encode(displays); + sendAll(Relay.WINDOWS, data -> data.writeByteArray(bytes)); + } + + private static String packageOf(AccessibilityWindowInfo window) { + try { + AccessibilityNodeInfo root = window.getRoot(); + if (root == null || root.getPackageName() == null) return null; + return root.getPackageName().toString(); + } catch (RuntimeException e) { + return null; + } + } + + private interface Writer { void write(Parcel data); } + + private void sendAll(int code, Writer writer) { + for (Link link : links) { + IBinder binder = link.binder; + if (binder == null) continue; + if (code != Relay.INTERRUPT && (link.flags & Relay.WANTS_WINDOWS) == 0) continue; + Parcel data = Parcel.obtain(); + try { + data.writeInterfaceToken(Relay.DESCRIPTOR); + writer.write(data); + binder.transact(code, data, null, IBinder.FLAG_ONEWAY); + } catch (RemoteException | RuntimeException ignored) { + } finally { + data.recycle(); + } + } + } + + @Override + public void onInterrupt() { + sendAll(Relay.INTERRUPT, data -> {}); + } + + @Override + public boolean onUnbind(Intent intent) { + release(); + return super.onUnbind(intent); + } + + @Override + public void onDestroy() { + release(); + super.onDestroy(); + } + + private void release() { + if (receiving) { + receiving = false; + try { unregisterReceiver(packages); } catch (RuntimeException ignored) {} + } + for (Link link : links) drop(link); + if (windowsThread != null) { + windows.removeCallbacksAndMessages(null); + windowsThread.quitSafely(); + windowsThread = null; + } + } +} diff --git a/shortcuts/src/main/res/values/strings.xml b/shortcuts/src/main/res/values/strings.xml new file mode 100644 index 0000000000..816e96bcf8 --- /dev/null +++ b/shortcuts/src/main/res/values/strings.xml @@ -0,0 +1,6 @@ + + + DroidDeck system keys + DroidDeck system keys + Keep Alt+Tab, the Win key and the Home button inside a focused DroidDeck session instead of Android. + diff --git a/app/src/main/res/xml/home_button_service.xml b/shortcuts/src/main/res/xml/shortcuts_service.xml similarity index 80% rename from app/src/main/res/xml/home_button_service.xml rename to shortcuts/src/main/res/xml/shortcuts_service.xml index 0c67e9effd..af91baa315 100644 --- a/app/src/main/res/xml/home_button_service.xml +++ b/shortcuts/src/main/res/xml/shortcuts_service.xml @@ -4,4 +4,4 @@ android:accessibilityFlags="flagRequestFilterKeyEvents" android:canRequestFilterKeyEvents="true" android:canRetrieveWindowContent="true" - android:description="@string/integration_shortcuts_service_description" /> + android:description="@string/service_description" /> diff --git a/shortcuts/src/protocol/java/com/droiddeck/shortcuts/Relay.java b/shortcuts/src/protocol/java/com/droiddeck/shortcuts/Relay.java new file mode 100644 index 0000000000..77f354d055 --- /dev/null +++ b/shortcuts/src/protocol/java/com/droiddeck/shortcuts/Relay.java @@ -0,0 +1,90 @@ +package com.droiddeck.shortcuts; + +import android.graphics.Rect; +import android.os.Parcel; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +public final class Relay { + public static final String PACKAGE = "com.droiddeck.shortcuts"; + public static final String SERVICE = PACKAGE + ".ShortcutsService"; + public static final String ACTION = "com.droiddeck.shortcuts.RELAY"; + public static final String DESCRIPTOR = "com.droiddeck.shortcuts.Relay"; + + public static final int CONFIG = 1; + public static final int KEY = 2; + public static final int INTERRUPT = 3; + public static final int ARRIVAL = 4; + public static final int WINDOWS = 5; + + public static final int WANTS_WINDOWS = 1; + + public static final class Window { + public final int id; + public final int type; + public final int layer; + public final Rect bounds; + public final String pkg; + + public Window(int id, int type, int layer, Rect bounds, String pkg) { + this.id = id; + this.type = type; + this.layer = layer; + this.bounds = bounds; + this.pkg = pkg; + } + } + + public static byte[] encode(Map> displays) { + Parcel parcel = Parcel.obtain(); + try { + parcel.writeInt(displays.size()); + for (Map.Entry> display : displays.entrySet()) { + parcel.writeInt(display.getKey()); + parcel.writeInt(display.getValue().size()); + for (Window window : display.getValue()) { + parcel.writeInt(window.id); + parcel.writeInt(window.type); + parcel.writeInt(window.layer); + parcel.writeInt(window.bounds.left); + parcel.writeInt(window.bounds.top); + parcel.writeInt(window.bounds.right); + parcel.writeInt(window.bounds.bottom); + parcel.writeString(window.pkg); + } + } + return parcel.marshall(); + } finally { + parcel.recycle(); + } + } + + public static Map> decode(byte[] bytes) { + Parcel parcel = Parcel.obtain(); + try { + parcel.unmarshall(bytes, 0, bytes.length); + parcel.setDataPosition(0); + Map> displays = new LinkedHashMap<>(); + for (int d = parcel.readInt(); d > 0; d--) { + int display = parcel.readInt(); + List windows = new ArrayList<>(); + for (int w = parcel.readInt(); w > 0; w--) { + int id = parcel.readInt(); + int type = parcel.readInt(); + int layer = parcel.readInt(); + Rect bounds = new Rect(parcel.readInt(), parcel.readInt(), parcel.readInt(), parcel.readInt()); + windows.add(new Window(id, type, layer, bounds, parcel.readString())); + } + displays.put(display, windows); + } + return displays; + } finally { + parcel.recycle(); + } + } + + private Relay() {} +} diff --git a/tools/release/sign-apk.sh b/tools/release/sign-apk.sh index a7cfd8f531..15fbb4e33c 100755 --- a/tools/release/sign-apk.sh +++ b/tools/release/sign-apk.sh @@ -40,23 +40,37 @@ if [ "$pkg" != "$P" ]; then && die "$variant: the manifest still names $P in an authority or task" fi -"$BUILD_TOOLS/zipalign" -p -f 4 "$work/renamed.apk" "$work/aligned.apk" - "$BUILD_TOOLS/apksigner" rotate --out "$work/lineage" \ --old-signer --ks "$TESTKEY" --ks-type PKCS12 --ks-pass env:TESTKEY_PASSWORD \ --ks-key-alias testkey --key-pass env:TESTKEY_PASSWORD --set-rollback false \ --new-signer --ks "$RELEASE_KEYSTORE" --ks-type PKCS12 --ks-pass env:RELEASE_STORE_PASSWORD \ --ks-key-alias "$RELEASE_KEY_ALIAS" --key-pass env:RELEASE_STORE_PASSWORD -"$BUILD_TOOLS/apksigner" sign \ - --ks "$TESTKEY" --ks-type PKCS12 --ks-pass env:TESTKEY_PASSWORD \ - --ks-key-alias testkey --key-pass env:TESTKEY_PASSWORD \ - --next-signer --ks "$RELEASE_KEYSTORE" --ks-type PKCS12 --ks-pass env:RELEASE_STORE_PASSWORD \ - --ks-key-alias "$RELEASE_KEY_ALIAS" --key-pass env:RELEASE_STORE_PASSWORD \ - --lineage "$work/lineage" --rotation-min-sdk-version 28 \ - --v1-signing-enabled true --v2-signing-enabled true --v3-signing-enabled true --v4-signing-enabled false \ - --out "$out" "$work/aligned.apk" -rm -f "$out.idsig" +sign() { + "$BUILD_TOOLS/apksigner" sign \ + --ks "$TESTKEY" --ks-type PKCS12 --ks-pass env:TESTKEY_PASSWORD \ + --ks-key-alias testkey --key-pass env:TESTKEY_PASSWORD \ + --next-signer --ks "$RELEASE_KEYSTORE" --ks-type PKCS12 --ks-pass env:RELEASE_STORE_PASSWORD \ + --ks-key-alias "$RELEASE_KEY_ALIAS" --key-pass env:RELEASE_STORE_PASSWORD \ + --lineage "$work/lineage" --rotation-min-sdk-version 28 \ + --v1-signing-enabled true --v2-signing-enabled true --v3-signing-enabled true --v4-signing-enabled false \ + --out "$2" "$1" + rm -f "$2.idsig" +} + +companion=assets/shortcuts.apk +if unzip -l "$work/renamed.apk" "$companion" >/dev/null 2>&1; then + mkdir -p "$work/companion/assets" + unzip -p "$work/renamed.apk" "$companion" > "$work/companion-in.apk" + sign "$work/companion-in.apk" "$work/companion/$companion" + companion_v3=$("$BUILD_TOOLS/apksigner" verify --min-sdk-version 28 --print-certs "$work/companion/$companion" | sed -n 's/^.*Signer.* certificate SHA-256 digest: //p' | sort -u) + [ "$companion_v3" = "$expected" ] || die "$variant: the system keys companion is not signed with DroidDeck's key" + (cd "$work/companion" && zip -q -0 "$work/renamed.apk" "$companion") +fi + +"$BUILD_TOOLS/zipalign" -p -f 4 "$work/renamed.apk" "$work/aligned.apk" + +sign "$work/aligned.apk" "$out" "$BUILD_TOOLS/apksigner" verify --min-sdk-version 26 "$out" >/dev/null || die "$variant: does not verify" listing=$(unzip -l "$out")