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.

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

test/org/apache/cordova

CB-3: Apache source headers in callback-android

2012-02-23 11:36:08 -05:00

.classpath

Update framework's .classpath to what Eclipse wants it to be.

2014-02-26 20:18:35 -05:00

.project

Changing all tabs to spaces

2012-06-05 09:49:50 -04:00

AndroidManifest.xml

Remove Application settings from framework/AndroidManifest.xml

2013-11-15 12:01:12 -05:00

ant.properties

CB-3: Apache source headers in callback-android

2012-02-23 11:36:08 -05:00

build.xml

CB-5490: add javadoc target to ant script

2013-11-26 13:06:28 -05:00

default.properties

Changing all tabs to spaces

2012-06-05 09:49:50 -04:00

project.properties

Removing the xwalk_core_library reference so we can use this with MozillaView

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