holm/Unexpected-Keyboard
1
0
Fork 0
forked from extern/Unexpected-Keyboard
Code Pull Requests Activity

Remove the old implementation of the Caps lock button

Browse Source
This commit is contained in:
Jules Aguillon 2024-02-17 12:04:02 +01:00
parent 95e7494ad7
commit 408d80b26c
4 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
srcs/juloo.keyboard2/KeyEventHandler.java
View File

@ -292,7 +292,7 @@ public final class KeyEventHandler implements Config.IKeyEventHandler
public static interface IReceiver public static interface IReceiver
{ {
public void handle_event_key(KeyValue.Event ev); public void handle_event_key(KeyValue.Event ev);
public void set_shift_state(boolean state, boolean lock); public void set_shift_state(boolean state);
public InputConnection getCurrentInputConnection(); public InputConnection getCurrentInputConnection();
} }
@ -302,9 +302,9 @@ public final class KeyEventHandler implements Config.IKeyEventHandler
public void update_shift_state(boolean should_enable, boolean should_disable) public void update_shift_state(boolean should_enable, boolean should_disable)
{ {
if (should_enable) if (should_enable)
_recv.set_shift_state(true, false); _recv.set_shift_state(true);
else if (should_disable) else if (should_disable)
_recv.set_shift_state(false, false); _recv.set_shift_state(false);
} }
} }
} }

1
srcs/juloo.keyboard2/KeyValue.java
View File

@ -18,7 +18,6 @@ public final class KeyValue
SWITCH_FORWARD, SWITCH_FORWARD,
SWITCH_BACKWARD, SWITCH_BACKWARD,
SWITCH_GREEKMATH, SWITCH_GREEKMATH,
CAPS_LOCK,
SWITCH_VOICE_TYPING, SWITCH_VOICE_TYPING,
SWITCH_VOICE_TYPING_CHOOSER, SWITCH_VOICE_TYPING_CHOOSER,
} }

8
srcs/juloo.keyboard2/Keyboard2.java
View File

@ -418,10 +418,6 @@ public class Keyboard2 extends InputMethodService
setSpecialLayout(loadNumpad(R.xml.greekmath)); setSpecialLayout(loadNumpad(R.xml.greekmath));
break; break;
case CAPS_LOCK:
set_shift_state(true, true);
break;
case SWITCH_VOICE_TYPING: case SWITCH_VOICE_TYPING:
if (!VoiceImeSwitcher.switch_to_voice_ime(Keyboard2.this, get_imm(), if (!VoiceImeSwitcher.switch_to_voice_ime(Keyboard2.this, get_imm(),
Config.globalPrefs())) Config.globalPrefs()))
@ -435,9 +431,9 @@ public class Keyboard2 extends InputMethodService
} }
} }
public void set_shift_state(boolean state, boolean lock) public void set_shift_state(boolean state)
{ {
_keyboardView.set_shift_state(state, lock); _keyboardView.set_shift_state(state);
} }
public InputConnection getCurrentInputConnection() public InputConnection getCurrentInputConnection()

6
srcs/juloo.keyboard2/Keyboard2View.java
View File

@ -110,16 +110,16 @@ public class Keyboard2View extends View
} }
/** Called by auto-capitalisation. */ /** Called by auto-capitalisation. */
public void set_shift_state(boolean state, boolean lock) public void set_shift_state(boolean state)
{ {
if (_keyboard == null || _shift_key == null) if (_keyboard == null || _shift_key == null)
return; return;
int flags = _pointers.getKeyFlags(_shift_key, _shift_kv); int flags = _pointers.getKeyFlags(_shift_key, _shift_kv);
if (state) if (state)
{ {
if (flags != -1 && !lock) if (flags != -1)
return; // Don't replace an existing pointer return; // Don't replace an existing pointer
_pointers.add_fake_pointer(_shift_kv, _shift_key, lock); _pointers.add_fake_pointer(_shift_kv, _shift_key, false);
} }
else else
{ {