diff --git a/backends/platform/android/org/scummvm/scummvm/CustomKeyboardView.java b/backends/platform/android/org/scummvm/scummvm/CustomKeyboardView.java index dae9b40c2e0..9ac869c0a24 100755 --- a/backends/platform/android/org/scummvm/scummvm/CustomKeyboardView.java +++ b/backends/platform/android/org/scummvm/scummvm/CustomKeyboardView.java @@ -882,6 +882,7 @@ public class CustomKeyboardView extends View implements View.OnClickListener { } private void detectAndSendKey(int index, int x, int y, long eventTime, boolean isRepeated, boolean isReleaseKey) { + //Log.d(ScummVM.LOG_TAG, "CustomKeyboardView:: index =" + index + "isRelease: "+ isReleaseKey); if (index != NOT_A_KEY && index < mKeys.length) { final CustomKeyboard.CustomKey key = mKeys[index]; if (key.text != null) { diff --git a/backends/platform/android/org/scummvm/scummvm/ScummVMEventsBase.java b/backends/platform/android/org/scummvm/scummvm/ScummVMEventsBase.java index 16e7308c3f8..d4d50cd2ee1 100644 --- a/backends/platform/android/org/scummvm/scummvm/ScummVMEventsBase.java +++ b/backends/platform/android/org/scummvm/scummvm/ScummVMEventsBase.java @@ -171,7 +171,7 @@ public class ScummVMEventsBase implements // default: // actionStr = e.toString(); // } -// Log.d(ScummVM.LOG_TAG, "SCUMMV-EVENTS-BASE - onKEY:::" + keyCode + " Action::" + actionStr + " View:: " + actionView); // Called +// Log.d(ScummVM.LOG_TAG, "SCUMMV-EVENTS-BASE - onKEY:::" + keyCode + " Action::" + actionStr); // Called final int action = e.getAction(); @@ -216,7 +216,7 @@ public class ScummVMEventsBase implements } } - if (e.isSystem()) { + if (e.isSystem() || keyCode == KeyEvent.KEYCODE_MENU) { // no repeats for system keys if (e.getRepeatCount() > 0) { return false; @@ -356,6 +356,7 @@ public class ScummVMEventsBase implements } //_scummvm.displayMessageOnOSD("GetKey: " + keyCode + " unic=" + eventUnicodeChar+ " arg3= " + (eventUnicodeChar& KeyCharacterMap.COMBINING_ACCENT_MASK) + " meta: " + e.getMetaState()); + //Log.d(ScummVM.LOG_TAG,"GetKey: " + keyCode + " unic=" + eventUnicodeChar+ " arg3= " + (eventUnicodeChar& KeyCharacterMap.COMBINING_ACCENT_MASK) + " meta: " + e.getMetaState()); // look in events.cpp for how this is handled _scummvm.pushEvent(type, diff --git a/dists/android/res/xml/qwerty_alt.xml b/dists/android/res/xml/qwerty_alt.xml index bb32bf8702e..bf42945a116 100644 --- a/dists/android/res/xml/qwerty_alt.xml +++ b/dists/android/res/xml/qwerty_alt.xml @@ -52,7 +52,7 @@ - +