mirror of
https://github.com/fankes/termux-app.git
synced 2025-10-24 12:49:20 +08:00
Do not eat escape key events in onKeyPreIme()
The original reason for intercepting the escape key in onKeyPreIme() was to prevent the escape key as being treated as the Back key before reaching onKeyDown(). This seems no long necessary, and may mess up handling the ...+1 combination for escape on the Google Pixel C keyboard (see #27).
This commit is contained in:
@@ -491,9 +491,8 @@ public final class TerminalView extends View {
|
|||||||
@Override
|
@Override
|
||||||
public boolean onKeyPreIme(int keyCode, KeyEvent event) {
|
public boolean onKeyPreIme(int keyCode, KeyEvent event) {
|
||||||
if (LOG_KEY_EVENTS) Log.i(EmulatorDebug.LOG_TAG, "onKeyPreIme(keyCode=" + keyCode + ", event=" + event + ")");
|
if (LOG_KEY_EVENTS) Log.i(EmulatorDebug.LOG_TAG, "onKeyPreIme(keyCode=" + keyCode + ", event=" + event + ")");
|
||||||
if (keyCode == KeyEvent.KEYCODE_ESCAPE || (keyCode == KeyEvent.KEYCODE_BACK && mOnKeyListener.shouldBackButtonBeMappedToEscape())) {
|
if (keyCode == KeyEvent.KEYCODE_BACK && mOnKeyListener.shouldBackButtonBeMappedToEscape()) {
|
||||||
// Handle the escape key ourselves to avoid the system from treating it as back key
|
// Intercept back button to treat it as escape:
|
||||||
// and e.g. close keyboard.
|
|
||||||
switch (event.getAction()) {
|
switch (event.getAction()) {
|
||||||
case KeyEvent.ACTION_DOWN:
|
case KeyEvent.ACTION_DOWN:
|
||||||
return onKeyDown(keyCode, event);
|
return onKeyDown(keyCode, event);
|
||||||
|
|||||||
Reference in New Issue
Block a user