You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2013/05/10 23:03:38 UTC
[13/13] android commit: Merging latest from master to bring
everything in line
Merging latest from master to bring everything in line
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/d840446d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/d840446d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/d840446d
Branch: refs/heads/3.0.0
Commit: d840446d38ab9e58e79c5a838cee045d23da81d3
Parents: 3e01b43 48b8c69
Author: Joe Bowser <bo...@apache.org>
Authored: Tue May 7 10:45:01 2013 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Tue May 7 10:45:01 2013 -0700
----------------------------------------------------------------------
.../src/org/apache/cordova/CordovaActivity.java | 12 +++++++-
framework/src/org/apache/cordova/DroidGap.java | 21 +++++++++++++++
2 files changed, 31 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/d840446d/framework/src/org/apache/cordova/CordovaActivity.java
----------------------------------------------------------------------
diff --cc framework/src/org/apache/cordova/CordovaActivity.java
index fa610f4,6e3d99d..af2202b
--- a/framework/src/org/apache/cordova/CordovaActivity.java
+++ b/framework/src/org/apache/cordova/CordovaActivity.java
@@@ -684,8 -679,16 +684,17 @@@ public class CordovaActivity extends Ac
*/
protected void onResume() {
super.onResume();
+
+ LOG.d(TAG, "Resuming the App");
+ //Reload the configuration
+ Config.init(this);
+
+ LOG.d(TAG, "Resuming the App");
+
-
+ //Code to test CB-3064
+ String errorUrl = this.getStringProperty("errorUrl", null);
+ LOG.d(TAG, "CB-3064: The errorUrl is " + errorUrl);
+
if (this.activityState == ACTIVITY_STARTING) {
this.activityState = ACTIVITY_RUNNING;
return;
@@@ -1038,7 -1041,7 +1047,6 @@@
root.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT,
ViewGroup.LayoutParams.FILL_PARENT, 0.0F));
root.setBackgroundResource(that.splashscreen);
-
-
// Create and show the dialog
splashDialog = new Dialog(that, android.R.style.Theme_Translucent_NoTitleBar);
// check to see if the splash screen should be full screen