mirror of
https://github.com/Julow/Unexpected-Keyboard.git
synced 2024-11-27 01:33:15 +01:00
Remove the old implementation of the Caps lock button
This commit is contained in:
parent
95e7494ad7
commit
408d80b26c
@ -292,7 +292,7 @@ public final class KeyEventHandler implements Config.IKeyEventHandler
|
||||
public static interface IReceiver
|
||||
{
|
||||
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();
|
||||
}
|
||||
|
||||
@ -302,9 +302,9 @@ public final class KeyEventHandler implements Config.IKeyEventHandler
|
||||
public void update_shift_state(boolean should_enable, boolean should_disable)
|
||||
{
|
||||
if (should_enable)
|
||||
_recv.set_shift_state(true, false);
|
||||
_recv.set_shift_state(true);
|
||||
else if (should_disable)
|
||||
_recv.set_shift_state(false, false);
|
||||
_recv.set_shift_state(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -18,7 +18,6 @@ public final class KeyValue
|
||||
SWITCH_FORWARD,
|
||||
SWITCH_BACKWARD,
|
||||
SWITCH_GREEKMATH,
|
||||
CAPS_LOCK,
|
||||
SWITCH_VOICE_TYPING,
|
||||
SWITCH_VOICE_TYPING_CHOOSER,
|
||||
}
|
||||
|
@ -418,10 +418,6 @@ public class Keyboard2 extends InputMethodService
|
||||
setSpecialLayout(loadNumpad(R.xml.greekmath));
|
||||
break;
|
||||
|
||||
case CAPS_LOCK:
|
||||
set_shift_state(true, true);
|
||||
break;
|
||||
|
||||
case SWITCH_VOICE_TYPING:
|
||||
if (!VoiceImeSwitcher.switch_to_voice_ime(Keyboard2.this, get_imm(),
|
||||
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()
|
||||
|
@ -110,16 +110,16 @@ public class Keyboard2View extends View
|
||||
}
|
||||
|
||||
/** 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)
|
||||
return;
|
||||
int flags = _pointers.getKeyFlags(_shift_key, _shift_kv);
|
||||
if (state)
|
||||
{
|
||||
if (flags != -1 && !lock)
|
||||
if (flags != -1)
|
||||
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
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user