You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ia...@apache.org on 2014/09/11 17:29:13 UTC
[31/31] android commit: Merge branch 'master' into 4.0.x
Merge branch 'master' into 4.0.x
Conflicts:
framework/src/org/apache/cordova/CordovaActivity.java
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/dd5a337a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/dd5a337a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/dd5a337a
Branch: refs/heads/4.0.x
Commit: dd5a337a49cac4110b0c114ee5c65020c4a2ecf6
Parents: 51e634c bf13fd4
Author: Ian Clelland <ic...@chromium.org>
Authored: Thu Sep 11 10:18:35 2014 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Thu Sep 11 10:18:35 2014 -0400
----------------------------------------------------------------------
bin/lib/check_reqs.js | 52 +++++---
bin/lib/create.js | 7 +-
bin/templates/project/build.gradle | 25 +++-
bin/templates/project/cordova.gradle | 123 +++++++++++++++++++
framework/build.gradle | 25 +++-
.../src/org/apache/cordova/CordovaActivity.java | 2 -
.../apache/cordova/test/SabotagedActivity.java | 19 +++
.../test/junit/IntentUriOverrideTest.java | 19 +++
8 files changed, 244 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/dd5a337a/bin/lib/create.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/dd5a337a/framework/src/org/apache/cordova/CordovaActivity.java
----------------------------------------------------------------------
diff --cc framework/src/org/apache/cordova/CordovaActivity.java
index c2971ae,bf1fd6a..6ec6791
--- a/framework/src/org/apache/cordova/CordovaActivity.java
+++ b/framework/src/org/apache/cordova/CordovaActivity.java
@@@ -208,14 -244,12 +208,12 @@@ public class CordovaActivity extends Ac
1.0F));
// Add web view but make it invisible while loading URL
- appView.setVisibility(View.INVISIBLE);
- root.addView((View) appView);
+ appView.getView().setVisibility(View.INVISIBLE);
+ root.addView(appView.getView());
setContentView(root);
- // TODO: Setting this on the appView causes it to show when <html style="opacity:0">.
int backgroundColor = preferences.getInteger("BackgroundColor", Color.BLACK);
root.setBackgroundColor(backgroundColor);
- appView.getView().setBackgroundColor(backgroundColor);
}
/**