Skip to content

Finish voice input on D-pad center / Enter instead of canceling (Android TV) #2078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PimpinPumpkin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Finish voice input on D-pad center / Enter instead of canceling (Android TV) #2078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions java/src/org/futo/inputmethod/latin/uix/Action.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.input.key.KeyEvent
import androidx.compose.ui.layout.LayoutCoordinates
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
Expand Down Expand Up @@ -149,6 +150,14 @@ abstract class ActionWindow {
open fun close(): CloseResult {
return CloseResult.Default
}

/**
* Called for a hardware key event while this window is open, before the event reaches focused
* composables in the window. This lets a window respond to e.g. a TV remote's D-pad center /
* Enter, where there is no touchscreen to tap the window. Return true to consume the event;
* the default implementation ignores all key events.
*/
open fun onKeyEvent(event: KeyEvent): Boolean = false
}

interface PersistentActionState {
Expand Down
3 changes: 2 additions & 1 deletion java/src/org/futo/inputmethod/latin/uix/UixManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.graphics.drawscope.scale
import androidx.compose.ui.graphics.drawscope.translate
import androidx.compose.ui.input.key.onPreviewKeyEvent
import androidx.compose.ui.input.pointer.pointerInput
import androidx.compose.ui.layout.LayoutCoordinates
import androidx.compose.ui.layout.onGloballyPositioned
Expand Down Expand Up @@ -808,7 +809,7 @@ class UixManager(private val latinIME: LatinIME) {
}

val showingAboveKeyboard = !mainKeyboardHidden.value
Column {
Column(Modifier.onPreviewKeyEvent { windowImpl.onKeyEvent(it) }) {
Column(
Modifier.background(
if (showingAboveKeyboard) {
Expand Down
21 changes: 21 additions & 0 deletions java/src/org/futo/inputmethod/latin/uix/actions/VoiceInputAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.input.key.Key
import androidx.compose.ui.input.key.KeyEvent
import androidx.compose.ui.input.key.KeyEventType
import androidx.compose.ui.input.key.key
import androidx.compose.ui.input.key.type
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.semantics
Expand Down Expand Up @@ -236,6 +241,22 @@ private class VoiceInputActionWindow(
return CloseResult.Default
}

override fun onKeyEvent(event: KeyEvent): Boolean {
// On a device driven by a D-pad / remote (e.g. Android TV) there is no touchscreen to tap
// the window to finish, and the D-pad center would otherwise activate the focused "back"
// button in the action bar and cancel dictation. Treat center/enter as a tap on the
// window: finish recognition and submit the result.
return when (event.key) {
Key.DirectionCenter, Key.Enter, Key.NumPadEnter -> {
if (event.type == KeyEventType.KeyUp) {
recognizerView.value?.finish()
}
true
}
else -> false
}
}

private var wasFinished = false
private var cancelPlayed = false
override fun cancelled() {
Expand Down