Updated Branches: refs/heads/master 3351fdbc7 -> 39d32bcb5
CB-4620: Throwing this over the fence, since there is a problem actually in the wild here Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/39d32bcb Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/39d32bcb Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/39d32bcb Branch: refs/heads/master Commit: 39d32bcb5b98495db1f18e2d28b6eccdef4a6264 Parents: 3351fdb Author: Joe Bowser <[email protected]> Authored: Wed Sep 11 15:02:00 2013 -0700 Committer: Joe Bowser <[email protected]> Committed: Wed Sep 11 15:02:00 2013 -0700 ---------------------------------------------------------------------- bin/templates/project/Activity.java | 3 ++- framework/src/org/apache/cordova/CordovaActivity.java | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/39d32bcb/bin/templates/project/Activity.java ---------------------------------------------------------------------- diff --git a/bin/templates/project/Activity.java b/bin/templates/project/Activity.java index c255e4c..00248b7 100644 --- a/bin/templates/project/Activity.java +++ b/bin/templates/project/Activity.java @@ -22,12 +22,13 @@ package __ID__; import android.os.Bundle; import org.apache.cordova.*; -public class __ACTIVITY__ extends DroidGap +public class __ACTIVITY__ extends CordovaActivity { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + super.init(); // Set by <content src="index.html" /> in config.xml super.loadUrl(Config.getStartUrl()); //super.loadUrl("file:///android_asset/www/index.html") http://git-wip-us.apache.org/repos/asf/cordova-android/blob/39d32bcb/framework/src/org/apache/cordova/CordovaActivity.java ---------------------------------------------------------------------- diff --git a/framework/src/org/apache/cordova/CordovaActivity.java b/framework/src/org/apache/cordova/CordovaActivity.java index d9b07e2..377c8fd 100755 --- a/framework/src/org/apache/cordova/CordovaActivity.java +++ b/framework/src/org/apache/cordova/CordovaActivity.java @@ -413,9 +413,12 @@ public class CordovaActivity extends Activity implements CordovaInterface { // If keepRunning this.keepRunning = this.getBooleanProperty("KeepRunning", true); - // Then load the spinner - this.loadSpinner(); - + //Check if the view is attached to anything + if(appView.getParent() != null) + { + // Then load the spinner + this.loadSpinner(); + } //Load the correct splashscreen if(this.splashscreen != 0)
