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

Merge branch 'master' into 4.0.x (App plugin from config.xml -> code)

Browse Source 
Conflicts:
	bin/templates/cordova/defaults.xml
	framework/res/xml/config.xml
	framework/src/org/apache/cordova/CordovaWebView.java
This commit is contained in:
Andrew Grieve
2014-07-08 11:52:44 -04:00
parent 67006add53 e86c2e5970
commit 9c5e340fb8
5 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/src/org/apache/cordova/AndroidWebView.java
+1
View File
@@ -147,6 +147,7 @@ public class AndroidWebView extends WebView implements CordovaWebView {
exposedJsApi = new AndroidExposedJsApi(pluginManager, jsMessageQueue);
resourceApi = new CordovaResourceApi(this.getContext(), pluginManager);
pluginManager.addService("App", "org.apache.cordova.CoreAndroid");
initWebViewSettings();
exposeJsInterface();
}
framework/src/org/apache/cordova/PluginManager.java
-5
View File
@@ -60,11 +60,6 @@ public class PluginManager {
PluginManager(CordovaWebView cordovaWebView, CordovaInterface cordova, List<PluginEntry> pluginEntries) {
this.ctx = cordova;
this.app = cordovaWebView;
if (pluginEntries == null) {
ConfigXmlParser parser = new ConfigXmlParser();
parser.parse(ctx.getActivity());
pluginEntries = parser.getPluginEntries();
}
setPluginEntries(pluginEntries);
}