Skip to content

Replace keyDownUp for DEL/SEARCH #30

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

Merged
tamo merged 2 commits into from
Mar 29, 2026
Merged

Replace keyDownUp for DEL/SEARCH #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87ac322
Translate keyDownUp for DEL/SEARCH
tamo Mar 28, 2026
f814607
Replace occurrences of DEL/SEARCH
tamo Mar 28, 2026
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
2 changes: 1 addition & 1 deletion app/src/main/java/jp/deadend/noname/skk/AbbrevKeyboardView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class AbbrevKeyboardView : KeyboardView, KeyboardView.OnKeyboardActionListener {
// repeatable
Keyboard.KEYCODE_DELETE -> {
if (!isCapsLocked) isShifted = false
if (!mService.handleBackspace()) mService.keyDownUp(KeyEvent.KEYCODE_DEL)
if (!mService.handleBackspace()) mService.pressDel()
}
// codes[0] 以外
Keyboard.KEYCODE_CAPSLOCK -> {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/jp/deadend/noname/skk/FlickJPKeyboardView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,7 +843,7 @@ class FlickJPKeyboardView(context: Context, attrs: AttributeSet?) : KeyboardView
override fun onLongPress(key: Keyboard.Key): Boolean {
val code = key.codes[0]
if (code == KEYCODE_FLICK_JP_ENTER) {
mService.keyDownUp(KeyEvent.KEYCODE_SEARCH)
mService.pressSearch()
return true
}

Expand Down Expand Up @@ -911,7 +911,7 @@ class FlickJPKeyboardView(context: Context, attrs: AttributeSet?) : KeyboardView
when (primaryCode) {
// repeatable
Keyboard.KEYCODE_DELETE -> if (!mService.handleBackspace()) {
mService.keyDownUp(KeyEvent.KEYCODE_DEL)
mService.pressDel()
}

KEYCODE_FLICK_JP_LEFT -> if (!mArrowFlicked && !mService.handleDpad(KeyEvent.KEYCODE_DPAD_LEFT)) {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/jp/deadend/noname/skk/GodanKeyboardView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ class GodanKeyboardView(context: Context, attrs: AttributeSet?) : KeyboardView(c
override fun onLongPress(key: Keyboard.Key): Boolean {
val code = key.codes[0]
if (code == KEYCODE_GODAN_ENTER) {
mService.keyDownUp(KeyEvent.KEYCODE_SEARCH)
mService.pressSearch()
return true
}

Expand Down Expand Up @@ -625,7 +625,7 @@ class GodanKeyboardView(context: Context, attrs: AttributeSet?) : KeyboardView(c
// repeatable
Keyboard.KEYCODE_DELETE -> if (!mService.handleBackspace()) {
if (!isCapsLocked) isShifted = false
mService.keyDownUp(KeyEvent.KEYCODE_DEL)
mService.pressDel()
}

KEYCODE_GODAN_LEFT -> if (!mArrowFlicked && !mService.handleDpad(KeyEvent.KEYCODE_DPAD_LEFT)) {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/jp/deadend/noname/skk/QwertyKeyboardView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class QwertyKeyboardView : KeyboardView, KeyboardView.OnKeyboardActionListener {

override fun onLongPress(key: Keyboard.Key): Boolean {
if (key.codes[0] == KEYCODE_QWERTY_ENTER) {
mService.keyDownUp(KeyEvent.KEYCODE_SEARCH)
mService.pressSearch()
return true
}

Expand Down Expand Up @@ -120,7 +120,7 @@ class QwertyKeyboardView : KeyboardView, KeyboardView.OnKeyboardActionListener {
// repeatable
Keyboard.KEYCODE_DELETE -> {
if (!isCapsLocked) isShifted = false
if (!mService.handleBackspace()) mService.keyDownUp(KeyEvent.KEYCODE_DEL)
if (!mService.handleBackspace()) mService.pressDel()
}
// codes[0] 以外
Keyboard.KEYCODE_CAPSLOCK -> {
Expand Down
12 changes: 12 additions & 0 deletions app/src/main/java/jp/deadend/noname/skk/SKKService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1096,6 +1096,18 @@ class SKKService : InputMethodService() {
updateSuggestionsASCII()
}

fun pressDel() {
val ic = currentInputConnection ?: return
ic.deleteSurroundingText(1, 0)
updateSuggestionsASCII()
}

fun pressSearch() {
val ic = currentInputConnection ?: return
ic.performEditorAction(EditorInfo.IME_ACTION_SEARCH)
updateSuggestionsASCII()
}

fun pressEnter() {
val ic = currentInputConnection ?: return
val editorInfo = currentInputEditorInfo
Expand Down
Loading