Repository: cordova-android Updated Branches: refs/heads/4.0.x 67006add5 -> 9c5e340fb
Move registration of App plugin from config.xml -> code Less fragile this way. Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/e86c2e59 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/e86c2e59 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/e86c2e59 Branch: refs/heads/4.0.x Commit: e86c2e59709709c767036fa48de1ed190451446b Parents: caeb868 Author: Andrew Grieve <[email protected]> Authored: Tue Jul 8 11:47:26 2014 -0400 Committer: Andrew Grieve <[email protected]> Committed: Tue Jul 8 11:47:26 2014 -0400 ---------------------------------------------------------------------- bin/templates/cordova/defaults.xml | 5 ----- framework/res/xml/config.xml | 4 ---- framework/src/org/apache/cordova/CordovaWebView.java | 1 + test/res/xml/config.xml | 3 --- 4 files changed, 1 insertion(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/e86c2e59/bin/templates/cordova/defaults.xml ---------------------------------------------------------------------- diff --git a/bin/templates/cordova/defaults.xml b/bin/templates/cordova/defaults.xml index 1654c13..5286ab9 100644 --- a/bin/templates/cordova/defaults.xml +++ b/bin/templates/cordova/defaults.xml @@ -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.App" /> - </feature> </widget> http://git-wip-us.apache.org/repos/asf/cordova-android/blob/e86c2e59/framework/res/xml/config.xml ---------------------------------------------------------------------- diff --git a/framework/res/xml/config.xml b/framework/res/xml/config.xml index 24e5725..50459b9 100644 --- a/framework/res/xml/config.xml +++ b/framework/res/xml/config.xml @@ -43,8 +43,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.App" /> - </feature> </widget> http://git-wip-us.apache.org/repos/asf/cordova-android/blob/e86c2e59/framework/src/org/apache/cordova/CordovaWebView.java ---------------------------------------------------------------------- diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java index 8eae350..4650588 100755 --- a/framework/src/org/apache/cordova/CordovaWebView.java +++ b/framework/src/org/apache/cordova/CordovaWebView.java @@ -157,6 +157,7 @@ public class CordovaWebView extends WebView { exposedJsApi = new ExposedJsApi(pluginManager, jsMessageQueue); resourceApi = new CordovaResourceApi(this.getContext(), pluginManager); + pluginManager.addService("App", "org.apache.cordova.App"); initWebViewSettings(); exposeJsInterface(); } http://git-wip-us.apache.org/repos/asf/cordova-android/blob/e86c2e59/test/res/xml/config.xml ---------------------------------------------------------------------- diff --git a/test/res/xml/config.xml b/test/res/xml/config.xml index 76172cb..7572732 100644 --- a/test/res/xml/config.xml +++ b/test/res/xml/config.xml @@ -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>
