Fix inaccessible text layout from pin

The "main" layout can now be pin layout. 'SWITCH_TEXT' and
'SWITCH_SECOND_BACK' don't mean to use that.
This commit is contained in:
Jules Aguillon 2022-12-29 12:43:02 +01:00
parent a891a3a99b
commit 764cd882d2
2 changed files with 4 additions and 4 deletions

View File

@ -45,7 +45,7 @@ class KeyEventHandler implements Config.IKeyEventHandler
{ {
case CONFIG: _recv.showKeyboardConfig(); break; case CONFIG: _recv.showKeyboardConfig(); break;
case SWITCH_TEXT: case SWITCH_TEXT:
case SWITCH_SECOND_BACK: _recv.switch_main(); break; case SWITCH_SECOND_BACK: _recv.switch_text(); break;
case SWITCH_NUMERIC: _recv.switch_layout(R.xml.numeric); break; case SWITCH_NUMERIC: _recv.switch_layout(R.xml.numeric); break;
case SWITCH_EMOJI: _recv.setPane_emoji(); break; case SWITCH_EMOJI: _recv.setPane_emoji(); break;
case SWITCH_BACK_EMOJI: _recv.setPane_normal(); break; case SWITCH_BACK_EMOJI: _recv.setPane_normal(); break;
@ -162,7 +162,7 @@ class KeyEventHandler implements Config.IKeyEventHandler
public void setPane_normal(); public void setPane_normal();
public void showKeyboardConfig(); public void showKeyboardConfig();
public void switch_main(); public void switch_text();
public void switch_second(); public void switch_second();
public void switch_layout(int layout_id); public void switch_layout(int layout_id);

View File

@ -319,9 +319,9 @@ public class Keyboard2 extends InputMethodService
_keyboardView.set_shift_state(state, lock); _keyboardView.set_shift_state(state, lock);
} }
public void switch_main() public void switch_text()
{ {
_keyboardView.setKeyboard(main_layout()); _keyboardView.setKeyboard(_currentTextLayout);
} }
public void switch_layout(int layout_id) public void switch_layout(int layout_id)