9c5e340fb8
Merge branch 'master' into 4.0.x (App plugin from config.xml -> code)
...
Conflicts:
bin/templates/cordova/defaults.xml
framework/res/xml/config.xml
framework/src/org/apache/cordova/CordovaWebView.java
2014-07-08 11:52:44 -04:00
e86c2e5970
Move registration of App plugin from config.xml -> code
...
Less fragile this way.
2014-07-08 11:47:26 -04:00
1571b26a65
Merge branch 'master' into 4.0.x (ConfigXmlParser + two-phase init)
...
Conflicts:
framework/src/org/apache/cordova/CordovaActivity.java
framework/src/org/apache/cordova/CordovaChromeClient.java
framework/src/org/apache/cordova/CordovaWebView.java
framework/src/org/apache/cordova/CordovaWebViewClient.java
framework/src/org/apache/cordova/PluginManager.java
2014-07-07 16:23:51 -04:00
0f15608175
CB-4404 Revert setting android:windowSoftInputMode to "adjustPan"
...
"adjustResize" is what the value has been set to for the longest time (due to it
being in the wrong place in the manifest). "adjustResize" is a better default value anyways.
2014-07-07 13:07:51 -04:00
705991e5b0
Refactor: Use ConfigXmlParser in activity. Adds CordovaWebView.init()
...
This does subtly change the API surface due to CordovaWebView.init(),
but only minimally, and is backwards compatibly with the default
generated projects from prior versions.
2014-07-04 16:32:09 -04:00
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
0ffb5d253a
CB-3445: android: Copy Gradle wrapper from Android SDK rather than bundling a JAR
2014-06-19 16:12:40 -04:00
693ec14df5
Rename App->CoreAndroid in defaults.xml (related to 635a6279a9)
2014-06-17 20:55:55 -04:00
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
663a919ed1
CB-4404: Changing where android:windowSoftInputMode is in the manifest so it works
2014-06-12 11:47:41 -07:00
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
d5e8807756
Set version to 4.0.0-dev
2014-06-06 15:00:41 -04:00
7e9fdb3555
Remove Ant custom build directories
2014-06-05 13:11:14 -04:00
32e07c22d0
CB-6876 Show the correct executable name
2014-06-04 19:23:43 -04:00
d427c52aac
CB-6876 Fix the "print usage"
2014-06-04 19:12:55 -04:00
743541218f
CB-6860 Add activity_name and launcher_name to AndroidManifest.xml & strings.xml
2014-06-03 16:08:35 -04:00
94de0a7ce2
Add a comment to custom_rules.xml saying why we move AndroidManifest.xml
2014-06-03 15:29:06 -04:00
1641f09dc9
Revert "defaults.xml: Add AndroidLaunchMode preference"
...
This reverts commit 11fc6be328
2014-05-29 14:50:01 -04:00
22b1959333
Manually fix Android sdk location to support library projects without local.properties
2014-05-22 14:04:00 -04:00
97008305ff
Merge branch 'master' into pluggable_webview
...
Conflicts:
framework/src/org/apache/cordova/CordovaWebView.java
2014-05-15 15:59:11 -04:00
00caa1c0a0
Set VERSION to 3.6.0-dev (via coho)
2014-05-06 15:51:14 -07:00
4a67dd2e28
Crosswalk runtime needs the two permissions to auto detect connection status.
...
See more details at: https://crosswalk-project.org/jira/browse/XWALK-1324
2014-04-29 22:50:11 -04:00
e6adbb0e42
CB-6543 Fix cordova/run failure when no custom_rules.xml available
...
Github: Close #99
2014-04-28 22:50:22 -04:00
11fc6be328
defaults.xml: Add AndroidLaunchMode preference
2014-04-25 00:27:33 +04:30
298cd9e065
Fix CB-6048: Set launchMode=singleTop so tapping app icon does not always restart app
2014-04-01 11:33:40 -04:00
87285d94f7
CB-5908: add splascreen images to template
...
This will enable the default splashscreens to reside in the correct place
after creating a new project. Before only the default icons were present.
I copied these from cordova-app-hello-world.
2014-02-10 16:56:45 -05:00
5b2a73e3eb
CB-5715 For CLI, hide assets/www and res/xml/config.xml by default
...
Add a helper file under assets to say how to re-show the hidden files.
Move the config.xml, www, merges entries to the root to be more discoverable.
2014-01-28 00:28:42 -05:00
6f163a6ba5
CB-5793 ant builds: Rename AndroidManifest during -post-build to avoid Eclipse detecting ant-build/ as a project when importing
2014-01-25 21:58:28 -05:00
708c042b61
Set VERSION to 3.5.0-dev (via coho)
2014-01-22 16:30:02 -08:00
600599f49e
Fix type "LANCH" -> "LAUNCH"
2014-01-22 14:53:40 -05:00
1fe7bbbbc4
CB-5793 Make ant work-around work on windows.
2014-01-21 21:14:32 -05:00
f83d7a7cd1
CB-5793 Add work-around for library references not working with custom output directory (ugh).
2014-01-21 15:09:15 -05:00
7094047b3d
CB-5793 Forgot to update ant path for clean.
2014-01-20 10:26:53 -05:00
11d3607688
CB-5793 Don't clean before build and change output directory to ant-build to avoid conflicts with Eclipse.
2014-01-19 23:09:00 -05:00
fcae58d355
CB-4910 Fix CLI's eclipse project template not working on windows due to "*" in the virtual folder name.
2014-01-17 12:00:29 -05:00
ef9ace9e65
CB-5803 Fix cordova/emulate on windows.
2014-01-16 13:19:39 -05:00
22e4039133
CB-5801 Add spawn work-around on windows for it not being able to execute .cmd files
...
More info: https://github.com/joyent/node/issues/2318
2014-01-16 12:11:31 -05:00
4971670e56
CB-5801 exec->spawn in build to make sure compile errors are shown.
2014-01-15 11:41:34 -05:00
51abf5b0a6
CB-4910 Update CLI project template to point to config.xml at the root now that it's not in www/ by default.
2014-01-14 12:29:53 -05:00
5e0479e414
CB-5715 Add Eclipse .project file to create template.
...
Adds resource filter to hide CordovaLib/, platform_www/, and cordova/.
Adds linked resources to root www/, merges/, config.xml
2014-01-02 16:40:48 -05:00
942c77816d
CB-5447 Removed android:debuggable=“true” from project template.
2013-12-30 11:27:17 -05:00
8e260d5c40
CB-5714 Fix of android build when too big output stops build with error due to buffer overflow.
2013-12-30 11:06:37 -05:00
be2f7d7a8a
Remove 2 X console.log from exec.js
...
With these console.log statements the output from commands such as 'list-devices' is very messy and hence difficult to parse the output programatically.
2013-12-23 08:54:46 -05:00
146e296826
CB-5047: Adding a defaults.xml template
...
This template will be consumed by the CLI, instead of the default
platform config.xml which is consumed by the bin/create workflow. We
remove the user app specific settings since those are to be edited in
the top level app config.xml by the user, and are injected by the CLI.
2013-12-05 14:33:21 -05:00
e646a0840d
Add missing semicolon
2013-12-05 12:41:28 -05:00
74ea6bf00a
Spelling fixes
2013-12-05 12:20:58 -05:00
dbbe038939
Set VERSION to 3.4.0-dev (via coho)
2013-12-03 15:44:21 -08:00
6856b02aa7
Set VERSION to 3.3.0-dev (via coho)
2013-11-06 15:06:19 -08:00
8783cf03b2
[CB-4996] Fix paths with spaces while launching on emulator and device
2013-11-06 10:37:59 -05:00
4e1156e083
CB-5284 Fixing the version from coho
...
Fixing the hardcoded versions, it got auto-incremented by accident.
2013-11-05 14:43:01 -05:00
Andrew Grieve