Andrew Grieve
4ce5123a12
Merge branch 'master' into 4.0.x (bindButton changes)
...
Conflicts:
framework/src/org/apache/cordova/CordovaWebView.java
package.json
2014-06-24 15:22:27 -04:00
Andrew Grieve
4b4a2e9f9e
CB-7018 Clean up and deprecation of some button-related functions
2014-06-24 15:08:47 -04:00
Andrew Grieve
58afd0b604
CB-7017 Fix onload=true being set on all subsequent plugins
2014-06-24 14:55:34 -04:00
Ian Clelland
4352456129
CB-5971: Fix package / project validation
2014-06-24 14:05:56 -04:00
Ian Clelland
bb141a70e8
CB-5971: Add unit tests to cordova-android
2014-06-24 14:05:56 -04:00
Ian Clelland
ff260c03ca
CB-5971: Factor out package/project name validation logic
2014-06-24 14:05:56 -04:00
Andrew Grieve
96a1192474
Merge branch 'master' into 4.0.x (back button default behaviour fix)
...
Conflicts:
framework/src/org/apache/cordova/CordovaChromeClient.java
framework/src/org/apache/cordova/CordovaWebView.java
2014-06-23 14:50:01 -04:00
Andrew Grieve
297f862ccc
Delete explicit activity.finish() in back button handling. No change in behaviour.
...
The default handling calls through to Activity.onBackPressed(), which
by default results in activity.finish(), but can be customized by the
app.
2014-06-23 14:18:54 -04:00
Andrew Grieve
c052f40ef8
Remove onKey* from CordovaWebView interface (these exist on View already)
2014-06-20 16:09:14 -04:00
Andrew Grieve
98246c0e35
Add a whitelist to PluginManager to be used by App Harness
...
App Harness needs a way to restrict which plugins get loaded for
embedded apps. This seemed like the simplest way, although a better
API would be to have PluginManager recieve the list of PluginEntry.
2014-06-20 12:34:08 -04:00
Joe Bowser
8ac067da89
Rethinking the URI helper
2014-06-19 13:20:44 -07:00
Ian Clelland
0ffb5d253a
CB-3445: android: Copy Gradle wrapper from Android SDK rather than bundling a JAR
2014-06-19 16:12:40 -04:00
Andrew Grieve
3a9898a6a6
CB-6971 Fix infinite recursion for onReceiveError
2014-06-18 13:20:47 -04:00
Andrew Grieve
693ec14df5
Rename App->CoreAndroid in defaults.xml (related to 635a6279a9
)
2014-06-17 20:55:55 -04:00
Ian Clelland
fa189b3234
CB-3445: Add an initial set of Gradle build scripts
...
These scripts will build an android project, in debug and release mode.
They also support additional library projects, such as Crosswalk, being
added to libraries.gradle (and settings.gradle). A flag can be set in
libraries.gradle to enable multi-architecture builds.
2014-06-17 17:36:26 -04:00
Joe Bowser
3b27cd093b
CB-6873: Removing from cordova-android, still in the camera plugin
2014-06-17 11:22:42 -07:00
Joe Bowser
141bbfb051
CB-5971: This would have been a good first bug, too bad
2014-06-12 17:51:22 -07:00
Joe Bowser
663a919ed1
CB-4404: Changing where android:windowSoftInputMode is in the manifest so it works
2014-06-12 11:47:41 -07:00
Marcel Kinard
483babe3bc
Add documentation referencing other implementation.
2014-06-09 15:50:20 -04:00
Andrew Grieve
6abb9da88a
Merge branch 'master' into 4.0.x
...
Conflicts:
bin/templates/project/custom_rules.xml
framework/src/org/apache/cordova/CordovaWebView.java
test/src/org/apache/cordova/test/junit/MessageTest.java
2014-06-08 22:54:21 -04:00
Andrew Grieve
b407641049
CB-6851 Deprecate WebView.sendJavascript()
2014-06-08 22:47:41 -04:00
Andrew Grieve
d5e8807756
Set version to 4.0.0-dev
2014-06-06 15:00:41 -04:00
Ian Clelland
7e9fdb3555
Remove Ant custom build directories
2014-06-05 13:11:14 -04:00
Marcel Kinard
32e07c22d0
CB-6876 Show the correct executable name
2014-06-04 19:23:43 -04:00
Marcel Kinard
d427c52aac
CB-6876 Fix the "print usage"
2014-06-04 19:12:55 -04:00
Joe Bowser
eb623a84d5
Trivial spelling fix in comments when reading CordovaResourceApi
2014-06-04 11:13:37 -07:00
Joe Bowser
07290277ba
CB-6818: I want to remove this code, because Square didn't do their headers properly
2014-06-03 15:22:10 -07:00
Andrew Grieve
743541218f
CB-6860 Add activity_name and launcher_name to AndroidManifest.xml & strings.xml
2014-06-03 16:08:35 -04:00
Andrew Grieve
94de0a7ce2
Add a comment to custom_rules.xml saying why we move AndroidManifest.xml
2014-06-03 15:29:06 -04:00
Andrew Grieve
36e9fb292b
Remove +x from README.md
2014-06-03 15:29:06 -04:00
Marcel Kinard
2661e010d9
CB-6784 Add missing licenses
...
for ./test/assets/www/cordova_plugins.js and ./test/res/xml/config.xml
2014-05-30 15:10:54 -04:00
Marcel Kinard
7687becfee
CB-6784 Add license to CONTRIBUTING.md
2014-05-30 11:45:13 -04:00
Michal Mocny
1641f09dc9
Revert "defaults.xml: Add AndroidLaunchMode preference"
...
This reverts commit 11fc6be328
.
2014-05-29 14:50:01 -04:00
Ian Clelland
b42faea2eb
Merge branch 'pluggable_webview' into 4.0.x
2014-05-29 11:20:35 -04:00
Steven Gill
1505673393
updated RELEASENOTES
2014-05-27 14:12:16 -07:00
Joe Bowser
635a6279a9
Renaming app plugin CoreAndroid to avoid confusion. It is now trivial to fix the JS away from App, but this will have to be a 4.x change
2014-05-26 13:11:27 -07:00
Joe Bowser
404d3e0959
CB-6315: Wrapping this so it runs on the UI thread
2014-05-23 11:31:13 -07:00
Marcel Kinard
f77b20bbca
CB-6723 Update package name for Robotium
2014-05-23 11:31:13 -07:00
Marcel Kinard
1d0a1664e6
CB-6707 Update minSdkVersion to 10 consistently
...
Update minSdkVersion in the AndroidManifest for the cordova.jar and the
test project.
2014-05-23 11:30:58 -07:00
Martin Gonzalez
410afbf9a1
CB-5652 make visible cordova version
...
Log the cordova version using version string from CordovaWebView.java
This closes #101
2014-05-23 11:30:58 -07:00
Steven Gill
aaddfa6f3a
Update JS snapshot to version 3.6.0-dev (via coho)
2014-05-23 11:30:58 -07:00
Joe Bowser
2d9a16e857
Update JS snapshot to version 3.6.0-dev (via coho)
2014-05-23 11:30:58 -07:00
Joe Bowser
1dcba51092
Set VERSION to 3.6.0-dev (via coho)
2014-05-23 11:30:57 -07:00
Joe Bowser
7c63b30de1
Added dash to test push
2014-05-23 11:23:29 -07:00
Andrew Grieve
c0eae1ad52
Revert accidentally removed lines from NOTICE
2014-05-23 11:23:29 -07:00
Steven Gill
c012b98223
CB-6552: updated author to apache software foundation in pacakge.json
2014-05-23 11:23:29 -07:00
Steven Gill
559493babd
CB-6552: updated test field
2014-05-23 11:23:29 -07:00
Steven Gill
990ab2c7ef
CB-6552: added top level package.json
2014-05-23 11:23:28 -07:00
Marcel Kinard
437003de29
CB-6491 add CONTRIBUTING.md
2014-05-23 11:23:28 -07:00
Joe Bowser
629e05b7b1
CB-6315: Wrapping this so it runs on the UI thread
2014-05-22 12:00:42 -07:00