aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Palevich <jackpal@google.com>2012-09-23 08:26:35 -0700
committerJack Palevich <jackpal@google.com>2012-09-23 08:26:35 -0700
commit1b2d8fb47173cb3ef88754ad2ff843957c35db17 (patch)
treed76011cd5667b70887a971cd8edf5b22f72f152b
parenta2d6e561a3a1eed86d095cb2415c84c513447761 (diff)
downloadAndroidTerm-1b2d8fb47173cb3ef88754ad2ff843957c35db17.tar.gz
Make Menu key work again on older (pre-3.0?) devices.
I'm guessing this broke when the keyboard handling code was re-written to support sending Alt-as-esc.
-rw-r--r--libraries/emulatorview/src/jackpal/androidterm/emulatorview/EmulatorView.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/libraries/emulatorview/src/jackpal/androidterm/emulatorview/EmulatorView.java b/libraries/emulatorview/src/jackpal/androidterm/emulatorview/EmulatorView.java
index 388befd..0fc5b07 100644
--- a/libraries/emulatorview/src/jackpal/androidterm/emulatorview/EmulatorView.java
+++ b/libraries/emulatorview/src/jackpal/androidterm/emulatorview/EmulatorView.java
@@ -967,6 +967,9 @@ public class EmulatorView extends View implements GestureDetector.OnGestureListe
if (LOG_KEY_EVENTS) {
Log.w(TAG, "onKeyDown " + keyCode);
}
+ if (keyCode == KeyEvent.KEYCODE_MENU) {
+ return super.onKeyDown(keyCode, event);
+ }
if (mTermKeyListener == null) {
mTermKeyListener = new TermKeyListener(mControlKeyCode, mFnKeyCode, mBackKeyCharacter, mAltSendsEsc, getKeypadApplicationMode());
}
@@ -1017,6 +1020,9 @@ public class EmulatorView extends View implements GestureDetector.OnGestureListe
if (LOG_KEY_EVENTS) {
Log.w(TAG, "onKeyUp " + keyCode);
}
+ if (keyCode == KeyEvent.KEYCODE_MENU) {
+ return super.onKeyUp(keyCode, event);
+ }
//MetaKeyKeyListener.handleKeyDown(metaState, keyCode, event)
boolean isHandled = mTermKeyListener.keyUp(event);
if (isHandled) {