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

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
commit 9c5e340fb8
5 changed files with 1 additions and 17 deletions

View File

@ -23,9 +23,4 @@
<!-- Preferences for Android -->
<preference name="loglevel" value="DEBUG" />
<!-- This is required for native Android hooks -->
<feature name="App">
<param name="android-package" value="org.apache.cordova.CoreAndroid" />
</feature>
</widget>

View File

@ -44,8 +44,4 @@
<preference name="InAppBrowserStorageEnabled" value="true" />
<preference name="disallowOverscroll" value="true" />
-->
<!-- This is required for native Android hooks -->
<feature name="App">
<param name="android-package" value="org.apache.cordova.CoreAndroid" />
</feature>
</widget>

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();
}

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);
}

View File

@ -36,7 +36,4 @@
<feature name="PluginStub">
<param name="android-package" value="org.apache.cordova.pluginApi.pluginStub" />
</feature>
<feature name="App">
<param name="android-package" value="org.apache.cordova.App" />
</feature>
</widget>