summaryrefslogtreecommitdiffstats
path: root/src/android/java
diff options
context:
space:
mode:
authorBogDan Vatra <bogdan@kdab.com>2016-02-15 19:19:58 +0200
committerBogDan Vatra <bogdan@kdab.com>2016-02-24 17:19:38 +0000
commit3376e67abe3a1ae5b3293b9c71b51e477c026b83 (patch)
tree95358d9ede4447de1444bb6ba8c48b9aca0bc91b /src/android/java
parentc05f2985eb90c7e18dee99676f0a5da3239e30b9 (diff)
Perfect (almost) Qt on Android splash screen.
There is no need to show the splash image immediately when the application starts, because it will be removed shortly in QtActivityDelegate.java, therefore show the splash in QtActivityDelegate.java. This patch also adds a new option to AndroidManifest.xml which keeps the splash screen visible until user to decides to hide it, by using the QtAndroid::hideSplashScreen() function. Change-Id: I8a29a5a757d626c4c9d6a2748a60ca3091ebf82d Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Diffstat (limited to 'src/android/java')
-rw-r--r--src/android/java/src/org/qtproject/qt5/android/bindings/QtActivityLoader.java9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivityLoader.java b/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivityLoader.java
index 836a7677b3..92cea65e4b 100644
--- a/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivityLoader.java
+++ b/src/android/java/src/org/qtproject/qt5/android/bindings/QtActivityLoader.java
@@ -166,15 +166,6 @@ public class QtActivityLoader extends QtLoader {
+ "/\tQT_ANDROID_THEME_DISPLAY_DPI=" + m_displayDensity + "\t";
if (null == m_activity.getLastNonConfigurationInstance()) {
- // if splash screen is defined, then show it
- // Note: QtActivityDelegate handles updating the splash screen
- // in onConfigurationChanged, change that too if you are changing
- // how the splash screen should be displayed
- if (m_contextInfo.metaData.containsKey("android.app.splash_screen_drawable"))
- m_activity.getWindow().setBackgroundDrawableResource(m_contextInfo.metaData.getInt("android.app.splash_screen_drawable"));
- else
- m_activity.getWindow().setBackgroundDrawable(new ColorDrawable(0xff000000));
-
if (m_contextInfo.metaData.containsKey("android.app.background_running")
&& m_contextInfo.metaData.getBoolean("android.app.background_running")) {
ENVIRONMENT_VARIABLES += "QT_BLOCK_EVENT_LOOPS_WHEN_SUSPENDED=0\t";