diff options
Diffstat (limited to 'src/android/jar/src/org/qtproject')
-rw-r--r-- | src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java | 18 | ||||
-rw-r--r-- | src/android/jar/src/org/qtproject/qt5/android/QtNative.java | 10 |
2 files changed, 10 insertions, 18 deletions
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java index f57497069a..b4b483b416 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java @@ -815,15 +815,6 @@ public class QtActivityDelegate if (!m_started) return false; - if (keyCode == KeyEvent.KEYCODE_MENU) { - try { - return (Boolean)m_super_onKeyDown.invoke(m_activity, keyCode, event); - } catch (Exception e) { - e.printStackTrace(); - return false; - } - } - m_metaState = MetaKeyKeyListener.handleKeyDown(m_metaState, keyCode, event); int c = event.getUnicodeChar(MetaKeyKeyListener.getMetaState(m_metaState)); int lc = c; @@ -858,15 +849,6 @@ public class QtActivityDelegate if (!m_started) return false; - if (keyCode == KeyEvent.KEYCODE_MENU) { - try { - return (Boolean)m_super_onKeyUp.invoke(m_activity, keyCode, event); - } catch (Exception e) { - e.printStackTrace(); - return false; - } - } - if ((keyCode == KeyEvent.KEYCODE_VOLUME_UP || keyCode == KeyEvent.KEYCODE_VOLUME_DOWN || keyCode == KeyEvent.KEYCODE_MUTE) diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java index 02bb1ae485..31a99bf910 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java @@ -484,6 +484,16 @@ public class QtNative }); } + private static void openOptionsMenu() + { + runAction(new Runnable() { + @Override + public void run() { + m_activity.openOptionsMenu(); + } + }); + } + private static byte[][] getSSLCertificates() { ArrayList<byte[]> certificateList = new ArrayList<byte[]>(); |