wzray/tt9
1
0
Fork 0
Code Activity

fixed incorrect handling of holding backspace or any other key, that prevented BACK from working

Browse source
This commit is contained in:
Dimo Karaivanov 2023-01-30 11:42:04 +02:00
parent a419a6c4cb
commit 3160b3be41
1 changed files with 13 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/io/github/sspanak/tt9/ime/KeyPadHandler.java
View file

@ -24,7 +24,7 @@ abstract class KeyPadHandler extends InputMethodService {
protected int mEditing = NON_EDIT; protected int mEditing = NON_EDIT;
// temporal key handling // temporal key handling
private boolean backspaceHandled = false; private boolean isBackspaceHandled = false;
private int ignoreNextKeyUp = 0; private int ignoreNextKeyUp = 0;
@ -136,8 +136,10 @@ abstract class KeyPadHandler extends InputMethodService {
if (keyCode == settings.getKeyBackspace()) { if (keyCode == settings.getKeyBackspace()) {
// When there is no more text, allow "Back" key to function normally, not to block navigation. // When there is no more text, allow "Back" key to function normally, not to block navigation.
// All other keys are blocked, unless it turns out it is annoying this way. // All other keys are blocked, unless it turns out it is annoying this way.
backspaceHandled = onBackspace() || keyCode != KeyEvent.KEYCODE_BACK; isBackspaceHandled = onBackspace() || keyCode != KeyEvent.KEYCODE_BACK;
return backspaceHandled; return isBackspaceHandled;
} else {
isBackspaceHandled = false;
} }
// In numeric fields, we do not want to handle anything, but "backspace" // In numeric fields, we do not want to handle anything, but "backspace"
@ -160,22 +162,15 @@ abstract class KeyPadHandler extends InputMethodService {
// start tracking key hold // start tracking key hold
if (shouldTrackNumPress() || isSpecialFunctionKey(-keyCode)) { if (shouldTrackNumPress() || isSpecialFunctionKey(-keyCode)) {
event.startTracking(); event.startTracking();
return true;
} }
if ( return isSpecialFunctionKey(keyCode) || isSpecialFunctionKey(-keyCode)
isSpecialFunctionKey(keyCode) || keyCode == KeyEvent.KEYCODE_STAR
|| keyCode == KeyEvent.KEYCODE_STAR || keyCode == KeyEvent.KEYCODE_POUND
|| keyCode == KeyEvent.KEYCODE_POUND || (isNumber(keyCode) && shouldTrackNumPress())
|| (isNumber(keyCode) && shouldTrackNumPress()) || ((keyCode == KeyEvent.KEYCODE_DPAD_UP || keyCode == KeyEvent.KEYCODE_DPAD_DOWN) && shouldTrackUpDown())
|| ((keyCode == KeyEvent.KEYCODE_DPAD_UP || keyCode == KeyEvent.KEYCODE_DPAD_DOWN) && shouldTrackUpDown()) || ((keyCode == KeyEvent.KEYCODE_DPAD_LEFT || keyCode == KeyEvent.KEYCODE_DPAD_RIGHT) && shouldTrackLeftRight())
|| ((keyCode == KeyEvent.KEYCODE_DPAD_LEFT || keyCode == KeyEvent.KEYCODE_DPAD_RIGHT) && shouldTrackLeftRight()) || (mEditing != EDITING_NOSHOW && keyCode == KeyEvent.KEYCODE_DPAD_CENTER);
|| (mEditing != EDITING_NOSHOW && keyCode == KeyEvent.KEYCODE_DPAD_CENTER)
) {
return true;
}
return false;
} }
@ -244,7 +239,7 @@ abstract class KeyPadHandler extends InputMethodService {
// Logger.d("onKeyUp", "Key: " + keyCode + " repeat?: " + event.getRepeatCount()); // Logger.d("onKeyUp", "Key: " + keyCode + " repeat?: " + event.getRepeatCount());
if (backspaceHandled && keyCode == settings.getKeyBackspace()) { if (isBackspaceHandled) {
return true; return true;
} }