github/cordova-android
4
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 (PluginEntry refactor)

Browse Source 
Conflicts:
	framework/src/org/apache/cordova/PluginEntry.java
	framework/src/org/apache/cordova/PluginManager.java
	test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java
This commit is contained in:
Andrew Grieve
2014-07-14 14:18:10 -04:00
parent b277202838 b934c1be6a
commit e2b3f76a10
4 changed files with 99 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java
+2 -1
View File
@@ -46,6 +46,7 @@ public class CordovaWebViewTestActivity extends Activity implements CordovaInter
setContentView(R.layout.main);
cordovaWebView = (CordovaWebView) findViewById(R.id.cordovaWebView);
Config.init(this);
cordovaWebView.init(this,
Config.getPluginEntries(), Config.getWhitelist(), Config.getPreferences());
@@ -100,4 +101,4 @@ public class CordovaWebViewTestActivity extends Activity implements CordovaInter
cordovaWebView.handleDestroy();
}
}
}
}