e9fcb296bb
Merge branch 'master' of github.com:callback/callback-android
2011-11-07 15:03:56 -06:00
db0a1919f3
Remove PhoneGap.stringify, replace with JSON.stringify
...
Since we don't support Android 1.5/1.6 anymore we don't need to check to see if JSON.stringify is around as it is included in Android 2.1+. By removing this check for JSON.stringify we remove two conditional checks on each call to PhoneGap.exec.
As well we get rid of 60 lines of code which are currently bloating phonegap.js.base.
2011-11-04 13:40:52 -07:00
141b8355ac
Don't fire resume upon init - only when returning from background.
...
Lifecycle behavior for PhoneGap app:
window.onload = loading html page
pause = html page entering background (not displayed)
resume = html page entering foreground (displayed)
window.onunload = leaving html page
2011-11-04 13:40:51 -07:00
cf9848bd59
Remove PhoneGap.stringify, replace with JSON.stringify
...
Since we don't support Android 1.5/1.6 anymore we don't need to check to see if JSON.stringify is around as it is included in Android 2.1+. By removing this check for JSON.stringify we remove two conditional checks on each call to PhoneGap.exec.
As well we get rid of 60 lines of code which are currently bloating phonegap.js.base.
2011-11-04 04:30:46 +08:00
7ad3f76d9a
Don't fire resume upon init - only when returning from background.
...
Lifecycle behavior for PhoneGap app:
window.onload = loading html page
pause = html page entering background (not displayed)
resume = html page entering foreground (displayed)
window.onunload = leaving html page
2011-11-03 14:22:29 -05:00
7244a5a727
Merge branch 'master' of github.com:callback/callback-android
2011-11-02 13:10:50 -07:00
538cdb03fc
No -e caused the bash script to fail
2011-11-02 12:01:36 -07:00
8057bca4f2
Merge pull request #11 from nisc/remote-issue-11
...
Fixes to make example project build
2011-11-01 19:42:07 -07:00
546b33c936
Fixes to make example project build and compile
...
On Ubuntu 11.04, that is.
2011-11-01 22:04:28 +01:00
9b5a63e8e4
Updated readme.
2011-10-31 21:14:05 -05:00
798d502083
Update for 1.2.0.
2011-10-31 20:46:22 -05:00
813637eb78
Update to download and run callback-test repository.
2011-10-31 20:45:38 -05:00
e4a5000f9e
This is an informative message, not an error message. It is normal to get this when leaving a page.
2011-10-31 20:39:42 -05:00
fd07cfc461
Update version to 1.2.0.
2011-10-31 17:29:08 -05:00
d1ec1f7693
Don't fire resume at app startup.
2011-10-31 14:18:32 -05:00
e1d3f1491f
Accidentally added stray char when changing the licence
2011-10-28 16:31:48 -07:00
5075a3e087
Merge branch 'master' of github.com:callback/callback-android
2011-10-28 13:26:17 -07:00
a35a33c05e
Adding the Apache Headers
2011-10-27 14:04:39 -07:00
5a40613ccc
Switching to ASF header for Callback
2011-10-27 12:04:54 -07:00
2d690ad014
Use LOG instead of System.out.println for logging.
2011-10-26 14:28:39 -05:00
ff2ee67cb8
JSPrompt "Security check" should whitelist all file URIs too
2011-10-25 15:34:32 -07:00
505081f42f
Merge branch 'master' of github.com:callback/callback-android
2011-10-25 15:21:15 -07:00
80ee464dce
Fix for Console.log, didn't call the super of the method needed
2011-10-25 15:21:06 -07:00
e4a992095f
Set activity state correctly when ending activity.
2011-10-25 14:57:55 -05:00
aa6e011255
Removing the Camera permission, since it is not required by PhoneGap by default
2011-10-25 11:31:01 -07:00
12816aa8f3
Run error dialog on UI thread.
2011-10-25 11:44:06 -05:00
60b5d42324
Set activity state correctly when ending activity.
2011-10-25 11:39:37 -05:00
d3d1c06c09
Merge pull request #2 from macdonst/webview
...
Fixing compilation error in DroidGap
2011-10-24 07:33:33 -07:00
010e162cd7
Fixing compilation error in DroidGap
2011-10-24 10:32:14 -04:00
191e1bf150
Merge branch 'master' of github.com:callback/callback-android
2011-10-21 16:44:12 -05:00
cdeddf1bb2
Merge pull request #1 from brycecurtis/webview
...
Load multi-page apps in same webview and update pause/resume for consiste
2011-10-21 14:43:13 -07:00
bd7ed19b52
Load multi-page apps in same webview and update pause/resume for consistency.
...
1. Make handling of multi-page apps consistent with iOS and Blackberry to load into same webview (instead of starting a new activity).
2. Make lifecycle consistent. pause is called when going into background, resume is called when coming into foreground. It is no longer called when loading or leaving an HTML page. Use window.onload/onunload to get these notifications.
2011-10-21 16:29:55 -05:00
64b770b761
Merge pull request #279 from infil00p/master
...
Clean-Up and Fix for Alert
2011-10-21 13:01:50 -07:00
628473cc5b
Making Alert cancellable so that it does not break the back button
2011-10-21 12:42:30 -07:00
75f3651376
Merge pull request #278 from infil00p/master
...
Modifying build.xml to use custom versions, adding ant files, and fixing HTC Logcat
2011-10-21 11:00:37 -07:00
3e25953d33
HTC Fix
2011-10-21 10:34:59 -07:00
996791696b
Merge pull request #275 from imhotep/master
...
Improved whitelisting
2011-10-20 16:18:42 -07:00
a08854eaf0
improved whitelisting
2011-10-20 15:09:48 -07:00
81ec4bc4fb
Merge branch 'master' of github.com:phonegap/phonegap-android
2011-10-20 13:58:11 -07:00
0b9ed0c7c7
Merging Simon's fix for Android 4
2011-10-20 13:54:26 -07:00
ffb614dd91
Merge pull request #274 from macdonst/android4
...
Fixing Project Properties file
2011-10-20 13:49:10 -07:00
e26685becf
Fixing Project Properties file
2011-10-20 16:48:16 -04:00
90b8c20e28
Merge pull request #273 from macdonst/android4
...
Updating to use Android 4.0 build environment
2011-10-20 13:27:42 -07:00
a8db71cd67
Updating to use Android 4.0 build environment
2011-10-20 16:26:30 -04:00
543fe1f43f
Upgrading to Ice Cream Sandwich
2011-10-20 11:13:44 -07:00
1f2f9a02dd
Merge pull request #272 from macdonst/mediaErr
...
Media err normalization with iOS
2011-10-19 12:25:27 -07:00
551f0f7e4a
Normalize MediaError's with iOS
2011-10-19 15:22:50 -04:00
369d140040
Return MediaError object instead of value
2011-10-19 15:06:36 -04:00
ac509369e9
forgot to resolve conflict
2011-10-14 15:49:16 -07:00
5faed8378c
Merge branch 'master' of github.com:phonegap/phonegap-android
...
Conflicts:
framework/res/xml/phonegap.xml
framework/src/com/phonegap/DroidGap.java
2011-10-14 15:43:13 -07:00
Bryce Curtis