cordova-android

History

Joe Bowser 105ccc81a5 This is an ugly merge commit, because the rebase made even less sense.

This should add the old setProperty methods required for the tests. We
decided to not deprecate them.  I don't make a habit of doing merge
commits, due to their destructive nature, but I think I might have
merged too much stuff in.

Merge branch 'pluggable_webview' of https://git-wip-us.apache.org/repos/asf/cordova-android into pluggable_webview

Conflicts:
	framework/src/org/apache/cordova/AndroidChromeClient.java
	framework/src/org/apache/cordova/AndroidWebView.java
	framework/src/org/apache/cordova/CordovaActivity.java
	framework/src/org/apache/cordova/CordovaWebView.java

2014-04-30 14:59:40 -07:00

.settings

Fix NPE when POLLING bridge mode is used.

2014-02-18 22:11:38 -05:00

assets/www

Update JS snapshot to version 3.5.0-dev-81f9a00

2014-04-02 13:42:19 -04:00

res

w00t! Managed to get XWalk to work. Next Step: Make it installable

2014-04-29 22:50:11 -04:00

src

This is an ugly merge commit, because the rebase made even less sense.