diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 49216ee5e4..b9597649ed 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -2210,8 +2210,20 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun dispatchKeyEvent(event: KeyEvent): Boolean { when (event.keyCode) { - KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.KEYCODE_VOLUME_MUTE -> + KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.KEYCODE_VOLUME_MUTE -> { + val steamVolume = + SessionState.mode == SessionService.MODE_STEAM && SessionState.running && + SessionState.firstFrameSeen && !SessionState.suspended && !ended && + !pipUi && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && + !gestureSettingsOpen && !screenKeyTextFocus && window.decorView.hasWindowFocus() + if (steamVolume) { + val audio = getSystemService(android.media.AudioManager::class.java) + if (com.droiddeck.launcher.input.SteamVolumeKeys.dispatch(event, !audio.isVolumeFixed) { direction -> + audio.adjustStreamVolume(android.media.AudioManager.STREAM_MUSIC, direction, 0) + }) return true + } return super.dispatchKeyEvent(event) + } } val backToQam = !pipUi && !screenKeyTextFocus && !drawerOpen && !pcKeyboardOpen && !achievementsOpen && SessionState.mode == SessionService.MODE_STEAM && SessionState.running && SessionState.firstFrameSeen && diff --git a/app/src/main/java/com/droiddeck/launcher/input/SteamVolumeKeys.kt b/app/src/main/java/com/droiddeck/launcher/input/SteamVolumeKeys.kt new file mode 100644 index 0000000000..3e0ca925aa --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/input/SteamVolumeKeys.kt @@ -0,0 +1,22 @@ +package com.droiddeck.launcher.input + +import android.media.AudioManager +import android.view.KeyEvent + +/** Use Steam's PulseAudio bridge for feedback instead of requesting Android's volume UI. */ +internal object SteamVolumeKeys { + fun dispatch(event: KeyEvent, enabled: Boolean, adjust: (Int) -> Unit): Boolean { + val direction = when (event.keyCode) { + KeyEvent.KEYCODE_VOLUME_UP -> AudioManager.ADJUST_RAISE + KeyEvent.KEYCODE_VOLUME_DOWN -> AudioManager.ADJUST_LOWER + KeyEvent.KEYCODE_VOLUME_MUTE -> AudioManager.ADJUST_TOGGLE_MUTE + else -> return false + } + if (!enabled) return false + if (event.action == KeyEvent.ACTION_DOWN && + (event.keyCode != KeyEvent.KEYCODE_VOLUME_MUTE || event.repeatCount == 0)) { + adjust(direction) + } + return event.action == KeyEvent.ACTION_DOWN || event.action == KeyEvent.ACTION_UP + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/input/SteamVolumeKeysTest.kt b/app/src/test/java/com/droiddeck/launcher/input/SteamVolumeKeysTest.kt new file mode 100644 index 0000000000..cce0daa3cc --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/input/SteamVolumeKeysTest.kt @@ -0,0 +1,46 @@ +package com.droiddeck.launcher.input + +import android.media.AudioManager +import android.view.KeyEvent +import org.junit.Assert.* +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28, 33]) +class SteamVolumeKeysTest { + private val adjustments = mutableListOf() + + private fun key(code: Int, action: Int = KeyEvent.ACTION_DOWN, repeat: Int = 0) = + KeyEvent(0L, 0L, action, code, repeat) + + private fun dispatch(code: Int, enabled: Boolean = true, action: Int = KeyEvent.ACTION_DOWN, repeat: Int = 0) = + SteamVolumeKeys.dispatch(key(code, action, repeat), enabled, adjustments::add) + + @Test fun enabledKeysAdjustOncePerDownAndConsumeRelease() { + assertTrue(dispatch(KeyEvent.KEYCODE_VOLUME_UP)) + assertTrue(dispatch(KeyEvent.KEYCODE_VOLUME_UP, repeat = 1)) + assertTrue(dispatch(KeyEvent.KEYCODE_VOLUME_UP, action = KeyEvent.ACTION_UP)) + assertTrue(dispatch(KeyEvent.KEYCODE_VOLUME_DOWN)) + assertTrue(dispatch(KeyEvent.KEYCODE_VOLUME_DOWN, action = KeyEvent.ACTION_UP)) + assertEquals(listOf(AudioManager.ADJUST_RAISE, AudioManager.ADJUST_RAISE, AudioManager.ADJUST_LOWER), adjustments) + } + + @Test fun muteTogglesOnlyOnInitialPress() { + assertTrue(dispatch(KeyEvent.KEYCODE_VOLUME_MUTE)) + assertTrue(dispatch(KeyEvent.KEYCODE_VOLUME_MUTE, repeat = 1)) + assertTrue(dispatch(KeyEvent.KEYCODE_VOLUME_MUTE, action = KeyEvent.ACTION_UP)) + assertEquals(listOf(AudioManager.ADJUST_TOGGLE_MUTE), adjustments) + } + + @Test fun disabledAndNonVolumeKeysFallThrough() { + for (code in listOf(KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.KEYCODE_VOLUME_MUTE)) { + assertFalse(dispatch(code, enabled = false)) + assertFalse(dispatch(code, enabled = false, action = KeyEvent.ACTION_UP)) + } + assertFalse(dispatch(KeyEvent.KEYCODE_BUTTON_A)) + assertTrue(adjustments.isEmpty()) + } +}