github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-22 08:53:24 +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
commit 9c5e340fb8
5 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/templates/cordova/defaults.xml
View File

@ -23,9 +23,4 @@
<!-- Preferences for Android --> <!-- Preferences for Android -->
<preference name="loglevel" value="DEBUG" /> <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> </widget>

4
framework/res/xml/config.xml
View File

@ -44,8 +44,4 @@
<preference name="InAppBrowserStorageEnabled" value="true" /> <preference name="InAppBrowserStorageEnabled" value="true" />
<preference name="disallowOverscroll" 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> </widget>

1
framework/src/org/apache/cordova/AndroidWebView.java
View File

@ -147,6 +147,7 @@ public class AndroidWebView extends WebView implements CordovaWebView {
exposedJsApi = new AndroidExposedJsApi(pluginManager, jsMessageQueue); exposedJsApi = new AndroidExposedJsApi(pluginManager, jsMessageQueue);
resourceApi = new CordovaResourceApi(this.getContext(), pluginManager); resourceApi = new CordovaResourceApi(this.getContext(), pluginManager);
pluginManager.addService("App", "org.apache.cordova.CoreAndroid");
initWebViewSettings(); initWebViewSettings();
exposeJsInterface(); exposeJsInterface();
} }

5
framework/src/org/apache/cordova/PluginManager.java
View File

@ -60,11 +60,6 @@ public class PluginManager {
PluginManager(CordovaWebView cordovaWebView, CordovaInterface cordova, List<PluginEntry> pluginEntries) { PluginManager(CordovaWebView cordovaWebView, CordovaInterface cordova, List<PluginEntry> pluginEntries) {
this.ctx = cordova; this.ctx = cordova;
this.app = cordovaWebView; this.app = cordovaWebView;
if (pluginEntries == null) {
ConfigXmlParser parser = new ConfigXmlParser();
parser.parse(ctx.getActivity());
pluginEntries = parser.getPluginEntries();
}
setPluginEntries(pluginEntries); setPluginEntries(pluginEntries);
} }

3
test/res/xml/config.xml
View File

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