diff options
author | BogDan Vatra <bogdan@kde.org> | 2014-05-21 12:23:31 +0300 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-22 18:20:02 +0200 |
commit | 09ed9e3eae71efdcc769a83859fcfa976ed40694 (patch) | |
tree | 7a67d32c419f078a2dd1f2b94a2e61369673e514 /src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java | |
parent | 00470662e3ec296cd0619e1a5a71aebcb32d9a8a (diff) |
Android: Extract data for native style on startup
When Ministro is not in use, we need to extract style
information on startup in order for the native Android style
to work.
The code to extract data from the device is contributed from
the Ministro project.
[ChangeLog][Android] Enable using native style also when
Ministro deployment mechanism is not in use.
Task-number: QTBUG-36019
Change-Id: I2afef5219b4e8fbb2f3e387cbc5e570da1f41011
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java')
-rw-r--r-- | src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java | 6 |
1 files changed, 6 insertions, 0 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 554c54d4a0..7e7312cde8 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java @@ -99,6 +99,7 @@ public class QtActivityDelegate private static final String APPLICATION_PARAMETERS_KEY = "application.parameters"; private static final String STATIC_INIT_CLASSES_KEY = "static.init.classes"; private static final String NECESSITAS_API_LEVEL_KEY = "necessitas.api.level"; + private static final String EXTRACT_STYLE_KEY = "extract.android.style"; private static String m_environmentVariables = null; private static String m_applicationParameters = null; @@ -426,6 +427,11 @@ public class QtActivityDelegate if (null == m_mainLib && libraries.size() > 0) m_mainLib = libraries.get(libraries.size() - 1); + if (loaderParams.containsKey(EXTRACT_STYLE_KEY)) { + String path = loaderParams.getString(EXTRACT_STYLE_KEY); + new ExtractStyle(m_activity, path); + } + try { m_super_dispatchKeyEvent = m_activity.getClass().getMethod("super_dispatchKeyEvent", KeyEvent.class); m_super_onRestoreInstanceState = m_activity.getClass().getMethod("super_onRestoreInstanceState", Bundle.class); |