cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dase...@apache.org
Subject cordova-plugin-splashscreen git commit: CB-10422 Splashscreen displays black screen with no image on Android
Date Wed, 27 Jan 2016 16:10:13 GMT
Repository: cordova-plugin-splashscreen
Updated Branches:
  refs/heads/master 109c82b29 -> 617960ee3


CB-10422 Splashscreen displays black screen with no image on Android


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/commit/617960ee
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/tree/617960ee
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/diff/617960ee

Branch: refs/heads/master
Commit: 617960ee3ef0ef8e905e22ed3fb94783c555fddc
Parents: 109c82b
Author: daserge <v-seshak@microsoft.com>
Authored: Mon Jan 25 16:21:57 2016 +0300
Committer: daserge <v-seshak@microsoft.com>
Committed: Wed Jan 27 18:58:56 2016 +0300

----------------------------------------------------------------------
 src/android/SplashScreen.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen/blob/617960ee/src/android/SplashScreen.java
----------------------------------------------------------------------
diff --git a/src/android/SplashScreen.java b/src/android/SplashScreen.java
index 68a4ce0..6a077c0 100644
--- a/src/android/SplashScreen.java
+++ b/src/android/SplashScreen.java
@@ -258,7 +258,7 @@ public class SplashScreen extends CordovaPlugin {
         final int drawableId = preferences.getInteger("SplashDrawableId", 0);
 
         final int fadeSplashScreenDuration = getFadeDuration();
-        final int effectiveSplashDuration = splashscreenTime - fadeSplashScreenDuration;
+        final int effectiveSplashDuration = Math.max(0, splashscreenTime - fadeSplashScreenDuration);
 
         lastHideAfterDelay = hideAfterDelay;
 
@@ -266,7 +266,7 @@ public class SplashScreen extends CordovaPlugin {
         if (splashDialog != null && splashDialog.isShowing()) {
             return;
         }
-        if (drawableId == 0 || (effectiveSplashDuration <= 0 && hideAfterDelay))
{
+        if (drawableId == 0 || (splashscreenTime <= 0 && hideAfterDelay)) {
             return;
         }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message