incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bcur...@apache.org
Subject android commit: [CB-423] Problem displaying patch-9 splash screen.
Date Mon, 02 Apr 2012 16:35:06 GMT
Updated Branches:
  refs/heads/master 5fa77e97b -> a37d0699d


[CB-423] Problem displaying patch-9 splash screen.


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/a37d0699
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/a37d0699
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/a37d0699

Branch: refs/heads/master
Commit: a37d0699db783d09d6a311c6367a10255e9479e4
Parents: 5fa77e9
Author: Bryce Curtis <curtis.bryce@gmail.com>
Authored: Mon Apr 2 11:34:57 2012 -0500
Committer: Bryce Curtis <curtis.bryce@gmail.com>
Committed: Mon Apr 2 11:34:57 2012 -0500

----------------------------------------------------------------------
 .../org/apache/cordova/CordovaChromeClient.java    |    3 +++
 .../org/apache/cordova/CordovaWebViewClient.java   |    3 +++
 2 files changed, 6 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/a37d0699/framework/src/org/apache/cordova/CordovaChromeClient.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaChromeClient.java b/framework/src/org/apache/cordova/CordovaChromeClient.java
index e9f8f93..2344c51 100755
--- a/framework/src/org/apache/cordova/CordovaChromeClient.java
+++ b/framework/src/org/apache/cordova/CordovaChromeClient.java
@@ -216,6 +216,9 @@ public class CordovaChromeClient extends WebChromeClient {
         // Cordova JS has initialized, so show webview
         // (This solves white flash seen when rendering HTML)
         else if (reqOk && defaultValue != null && defaultValue.equals("gap_init:"))
{
+            if (ctx.splashscreen != 0) {
+                ctx.root.setBackgroundResource(0);
+            }
             ctx.appView.setVisibility(View.VISIBLE);
             ctx.spinnerStop();
             result.confirm("OK");

http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/a37d0699/framework/src/org/apache/cordova/CordovaWebViewClient.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaWebViewClient.java b/framework/src/org/apache/cordova/CordovaWebViewClient.java
index 5eb2406..6bddfc3 100755
--- a/framework/src/org/apache/cordova/CordovaWebViewClient.java
+++ b/framework/src/org/apache/cordova/CordovaWebViewClient.java
@@ -229,6 +229,9 @@ public class CordovaWebViewClient extends WebViewClient {
                         Thread.sleep(2000);
                         ctx.runOnUiThread(new Runnable() {
                             public void run() {
+                                if (ctx.splashscreen != 0) {
+                                    ctx.root.setBackgroundResource(0);
+                                }
                                 ctx.appView.setVisibility(View.VISIBLE);
                                 ctx.spinnerStop();
                             }


Mime
View raw message