github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-07 23:03:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-4620: Throwing this over the fence, since there is a problem actually in the wild here

Browse Source
This commit is contained in:
Joe Bowser 2013-09-11 15:02:00 -07:00
parent 3351fdbc74
commit 39d32bcb5b
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bin/templates/project/Activity.java
View File

@ -22,12 +22,13 @@ package __ID__;
import android.os.Bundle; import android.os.Bundle;
import org.apache.cordova.*; import org.apache.cordova.*;
public class __ACTIVITY__ extends DroidGap public class __ACTIVITY__ extends CordovaActivity
{ {
@Override @Override
public void onCreate(Bundle savedInstanceState) public void onCreate(Bundle savedInstanceState)
{ {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
super.init();
// Set by <content src="index.html" /> in config.xml // Set by <content src="index.html" /> in config.xml
super.loadUrl(Config.getStartUrl()); super.loadUrl(Config.getStartUrl());
//super.loadUrl("file:///android_asset/www/index.html") //super.loadUrl("file:///android_asset/www/index.html")

9
framework/src/org/apache/cordova/CordovaActivity.java
View File

@ -413,9 +413,12 @@ public class CordovaActivity extends Activity implements CordovaInterface {
// If keepRunning // If keepRunning
this.keepRunning = this.getBooleanProperty("KeepRunning", true); this.keepRunning = this.getBooleanProperty("KeepRunning", true);
// Then load the spinner //Check if the view is attached to anything
this.loadSpinner(); if(appView.getParent() != null)
{
// Then load the spinner
this.loadSpinner();
}
//Load the correct splashscreen //Load the correct splashscreen
if(this.splashscreen != 0) if(this.splashscreen != 0)