20cd4f806a
Merge branch 'master' into 4.0.x (gradle version for Android Studio)
2014-12-22 11:25:59 -05:00
b92303b1c9
CB-8143 Use gradle plugin 1.0.0 for Android Studio 1.0.0
2014-12-22 11:19:21 -05:00
59d23e05b1
Merge branch 'master' into 4.0.x (apk signing with interactive passwords)
2014-12-22 10:22:41 -05:00
731a36d3a0
CB-8202 Fix gradle build signing when passwords provided interactively
2014-12-22 10:21:17 -05:00
162fc0720e
Merge branch 'master' into 4.0.x (SDK search path)
2014-12-16 14:18:58 -05:00
342bbaa3ae
CB-8176 Update Android SDK search path for Android Studio 1.0
2014-12-16 14:17:55 -05:00
f086ef5cad
Merge branch 'master' into 4.0.x (adb CWD & build --unknown-flag)
...
Conflicts:
framework/src/org/apache/cordova/SplashScreenInternal.java
2014-12-11 13:47:07 -05:00
56a3ee5fe6
CB-8079 Use activity class package name, but fallback to application
...
package name when looking for splash screen drawable
Close #136
2014-12-10 21:19:28 -05:00
d80d532a2a
Fix syntax error in 3aca14d530
2014-12-10 21:16:54 -05:00
3aca14d530
CB-8147 Have corodva/build warn about unrecognized flags rather than fail
...
Close #127
2014-12-10 21:02:57 -05:00
aa2d3962bf
Close #126 (not-a-problem)
2014-12-10 21:02:57 -05:00
f7c717e393
Close #137 (already merged).
2014-12-10 21:02:57 -05:00
268fea58ee
CB-7881 Android tooling shouldn't lock application directory
...
Close #130
2014-12-10 21:02:48 -05:00
87cdc5ad1c
Merge branch 'master' into 4.0.x (SplashScreen breakout)
...
Conflicts:
framework/src/org/apache/cordova/CordovaActivity.java
framework/src/org/apache/cordova/CordovaWebView.java
2014-12-10 16:09:22 -05:00
ba140a8a84
Add a section for plugin extensions
...
The build.gradle will apply gradle srcipte from plugin extension
When install the plugin with "gradleReference" framework.
The gradle can set ext.multiarch=true to support multiple APKs by
default, so add this section in here.
2014-12-10 15:44:39 -05:00
27f1181d53
CB-3679 Move splashscreen logic into splashscreen plugin
...
Tried as hard as possible for this not to be a breaking change (all
symbols were preserved). Planning to remove delegating symbols in 4.0.x
though.
Also for backwards compatability - a copy of the plugin is bundled. It
will likewise be removed in 4.0.x
2014-12-10 15:40:03 -05:00
f953e6adb8
CB-8143: Use the correct Android Gradle plugin for the installed Gradle version
2014-12-10 10:07:05 -05:00
ffd14fe7d9
Revert Gradle distributionUrlRegex cleanup.
...
This reverts commit 75a0a6752a
2014-12-09 14:23:38 -05:00
3206c2100d
Merge branch 'plugin-gradle' into 4.0.x
2014-12-09 09:43:37 -05:00
66fa12a091
CB-8119 Restart adb when we detect it's hung
2014-12-04 10:00:26 -05:00
b1bdf23d9c
Switch default build type to gradle (4.0.x only)
2014-12-03 10:12:31 -05:00
12bf07d560
Merge branch 'master' into 4.0.x (volume stream & setMediaPlaybackRequiresUserGesture)
...
Conflicts:
framework/src/org/apache/cordova/CordovaActivity.java
framework/src/org/apache/cordova/CordovaWebView.java
2014-12-03 10:09:05 -05:00
132650df28
CB-8112 Turn off mediaPlaybackRequiresUserGesture
2014-12-03 10:04:54 -05:00
81a77949fc
CB-6153 Add a preference for controlling hardware button audio stream (DefaultVolumeStream)
...
This, along with the commit to the audio plugin, makes it so that by
default apps control the ringer volume, but when any audio players are
active, the media volume is controlled.
2014-11-27 10:52:19 -05:00
e597f98c62
Merge branch 'master' into 4.0.x (gradle java 6 & PluginManager race fix)
2014-11-26 11:48:08 -05:00
7fbb2b195f
CB-8081 Allow gradle builds to use Java 6 instead of requiring 7
2014-11-26 11:44:49 -05:00
1feaa7fed7
CB-8031 Fix race condition that shows as ConcurrentModificationException
2014-11-17 22:11:21 -08:00
9b82ae19b0
Add a section for plugin extensions
...
The build.gradle will apply gradle srcipte from plugin extension
When install the plugin with "gradleReference" framework.
The gradle can set ext.multiarch=true to support multiple APKs by
default, so add this section in here.
2014-11-17 15:52:40 +08:00
9d3c13065b
CB-7980: Add 9 to versionCode for minSdk 20+ if not multiarch
2014-11-06 18:27:36 -05:00
4859f8f759
Merge branch 'master' into 4.0.x (receiver context)
2014-11-06 16:23:49 -05:00
ac284fd39c
CB-7976 Use webView's context rather than Activity's context for intent receiver
2014-11-06 16:23:32 -05:00
fdef0db87c
Merge branch 'master' into 4.0.x (Load timeout, bridge secret, content: URI)
...
Conflicts:
framework/src/org/apache/cordova/CordovaWebView.java
2014-11-06 15:37:30 -05:00
e78db000c6
CB-7974 Cancel timeout timer if view is destroyed
2014-11-06 15:33:10 -05:00
032ea8a8d3
CB-7940 Disable exec bridge if bridgeSecret is wrong
2014-11-04 15:57:51 -05:00
fc63f66e89
CB-7758: Allow content-url-hosted pages to access the bridge
...
This allows e.g. jsHybugger to create pages with access to Cordova APIs.
We restrict access to content provider URLs which are at subdomains of the application itself, ie, begin with "content://com.your.package.id."
2014-10-27 15:26:38 -04:00
832e626573
CB-7726 fix typo in gitignore: ant-built -> ant-build
...
github: close #131
2014-10-27 12:33:09 -04:00
cc7d352209
Merge branch 'master' into 4.0.x (gradle signing+SecureRandom)
2014-10-21 13:00:07 -04:00
ce5d9a2ee8
gradle: Allow storeType to be set (allows using .p12 files)
2014-10-21 12:59:34 -04:00
77c51d3ae7
gradle: Allow absolute paths to keystore files
2014-10-21 12:43:30 -04:00
53dae45430
Fixed the SecureRandom so it only returns positive values
2014-10-17 15:30:28 -07:00
16343ffe70
Undoing change to Math.random() for now, this creates a weird bug
2014-10-17 13:52:33 -07:00
b37498d5f6
Replacing Math.random() with something a little more random.
2014-10-14 10:11:09 -07:00
7ad16e5b0c
Merge branch 'master' into 4.0.x (Hardcode activity name)
2014-10-07 15:25:56 -04:00
9f41906895
CB-6511 Fixes build for android when app name contains unicode characters.
...
github: close #124
2014-10-07 15:24:12 -04:00
2af8daff1d
Merge branch 'master' into 4.0.x (multipart PluginResult)
2014-10-07 15:18:07 -04:00
fbeb379f1b
CB-7707 Added multipart PluginResult ( close #125 )
...
Corresponds to cordova-js commit: a1f866606b3
2014-10-07 15:17:56 -04:00
9577735ff7
Merge branch 'master' into 4.0.x (check_reqs for brew)
2014-10-06 10:34:19 -04:00
2dcd50c11b
CB-7714 Teach check_reqs about brew's install location for android SDK
2014-10-06 10:33:31 -04:00
862c223e11
Merge branch 'master' into 4.0.x (.gitignore, create --shared)
2014-10-04 15:30:30 -04:00
7f4d5aeb0e
Merge branch 'master' into 4.0.x (move preference activation, alert dialog leak)
...
Conflicts:
framework/src/org/apache/cordova/AndroidChromeClient.java
framework/src/org/apache/cordova/CordovaActivity.java
framework/src/org/apache/cordova/CordovaWebView.java
test/src/org/apache/cordova/test/menus.java
closes #123
2014-10-04 15:30:25 -04:00
Andrew Grieve