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

This commit is contained in:
daserge 2016-01-25 16:21:57 +03:00
parent 109c82b29b
commit 617960ee3e

View File

@ -258,7 +258,7 @@ public class SplashScreen extends CordovaPlugin {
final int drawableId = preferences.getInteger("SplashDrawableId", 0); final int drawableId = preferences.getInteger("SplashDrawableId", 0);
final int fadeSplashScreenDuration = getFadeDuration(); final int fadeSplashScreenDuration = getFadeDuration();
final int effectiveSplashDuration = splashscreenTime - fadeSplashScreenDuration; final int effectiveSplashDuration = Math.max(0, splashscreenTime - fadeSplashScreenDuration);
lastHideAfterDelay = hideAfterDelay; lastHideAfterDelay = hideAfterDelay;
@ -266,7 +266,7 @@ public class SplashScreen extends CordovaPlugin {
if (splashDialog != null && splashDialog.isShowing()) { if (splashDialog != null && splashDialog.isShowing()) {
return; return;
} }
if (drawableId == 0 || (effectiveSplashDuration <= 0 && hideAfterDelay)) { if (drawableId == 0 || (splashscreenTime <= 0 && hideAfterDelay)) {
return; return;
} }