diff options
Diffstat (limited to 'src/android')
3 files changed, 16 insertions, 26 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 0107cff23a..014023ecb1 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtNative.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtNative.java @@ -489,6 +489,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[]>(); diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java b/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java index c70f1d1aaf..e526c0a210 100644 --- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java +++ b/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java @@ -634,14 +634,12 @@ public class QtActivity extends Activity loaderParams.putStringArrayList(NATIVE_LIBRARIES_KEY, libraryList); - if (bundlingQtLibs) { - String themePath = pluginsPrefix + "android-style/"; - String stylePath = themePath + m_displayDensity + "/"; - if (!(new File(stylePath)).exists()) - loaderParams.putString(EXTRACT_STYLE_KEY, stylePath); - ENVIRONMENT_VARIABLES += "\tMINISTRO_ANDROID_STYLE_PATH=" + stylePath - + "\tQT_ANDROID_THEMES_ROOT_PATH=" + themePath; - } + String themePath = getApplicationInfo().dataDir + "/qt-reserved-files/android-style/"; + String stylePath = themePath + m_displayDensity + "/"; + if (!(new File(stylePath)).exists()) + loaderParams.putString(EXTRACT_STYLE_KEY, stylePath); + ENVIRONMENT_VARIABLES += "\tMINISTRO_ANDROID_STYLE_PATH=" + stylePath + + "\tQT_ANDROID_THEMES_ROOT_PATH=" + themePath; loaderParams.putString(ENVIRONMENT_VARIABLES_KEY, ENVIRONMENT_VARIABLES + "\tQML2_IMPORT_PATH=" + pluginsPrefix + "/qml" |