macdonst
d3d1c06c09
Merge pull request #2 from macdonst/webview
...
Fixing compilation error in DroidGap
2011-10-24 07:33:33 -07:00
macdonst
010e162cd7
Fixing compilation error in DroidGap
2011-10-24 10:32:14 -04:00
Bryce Curtis
191e1bf150
Merge branch 'master' of github.com:callback/callback-android
2011-10-21 16:44:12 -05:00
Bryce Curtis
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
Bryce Curtis
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
Joe Bowser
64b770b761
Merge pull request #279 from infil00p/master
...
Clean-Up and Fix for Alert
2011-10-21 13:01:50 -07:00
Joe Bowser
628473cc5b
Making Alert cancellable so that it does not break the back button
2011-10-21 12:42:30 -07:00
Joe Bowser
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
Joe Bowser
3e25953d33
HTC Fix
2011-10-21 10:34:59 -07:00
hardeep
996791696b
Merge pull request #275 from imhotep/master
...
Improved whitelisting
2011-10-20 16:18:42 -07:00
Anis Kadri
a08854eaf0
improved whitelisting
2011-10-20 15:09:48 -07:00
Anis Kadri
81ec4bc4fb
Merge branch 'master' of github.com:phonegap/phonegap-android
2011-10-20 13:58:11 -07:00
Joe Bowser
0b9ed0c7c7
Merging Simon's fix for Android 4
2011-10-20 13:54:26 -07:00
macdonst
ffb614dd91
Merge pull request #274 from macdonst/android4
...
Fixing Project Properties file
2011-10-20 13:49:10 -07:00
macdonst
e26685becf
Fixing Project Properties file
2011-10-20 16:48:16 -04:00
macdonst
90b8c20e28
Merge pull request #273 from macdonst/android4
...
Updating to use Android 4.0 build environment
2011-10-20 13:27:42 -07:00
macdonst
a8db71cd67
Updating to use Android 4.0 build environment
2011-10-20 16:26:30 -04:00
Joe Bowser
543fe1f43f
Upgrading to Ice Cream Sandwich
2011-10-20 11:13:44 -07:00
macdonst
1f2f9a02dd
Merge pull request #272 from macdonst/mediaErr
...
Media err normalization with iOS
2011-10-19 12:25:27 -07:00
macdonst
551f0f7e4a
Normalize MediaError's with iOS
2011-10-19 15:22:50 -04:00
macdonst
369d140040
Return MediaError object instead of value
2011-10-19 15:06:36 -04:00
Anis Kadri
ac509369e9
forgot to resolve conflict
2011-10-14 15:49:16 -07:00
Anis Kadri
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
7ee04ebf31
Fix Issue #258 - navigator.app.exitApp() and navigator.app.backHistory() not working in PhoneGap 1.1.0 on Android
2011-10-12 11:22:35 -05:00
Joe Bowser
0ec47c5bd8
Merge pull request #264 from infil00p/master
...
This time, let's handle BOTH the Back Button and the Search Button
2011-10-10 14:23:29 -07:00
Bryce Curtis
fe3e7041b7
Don't override history.back since jQuery also does it.
2011-10-06 22:21:09 -05:00
Joe Bowser
75ab33ad0c
Adding handling of Search Button for the jsPrompt
2011-10-05 16:01:10 -07:00
Joe Bowser
1377f60b29
Merge pull request #263 from infil00p/master
...
Fix the back button on jsConfirm
2011-10-05 14:16:20 -07:00
Joe Bowser
8b595f9796
Fixing the jsConfirm so it doesn't break the back button
2011-10-05 13:57:38 -07:00
Bryce Curtis
1f8d6b4866
Use endActivity() for consistency. Improve error handling.
2011-10-04 21:32:42 -05:00
macdonst
ea87dfe08a
Merge pull request #259 from macdonst/issue257
...
Fix for Issue #257 : File Transfer with file:/// URIs
2011-10-04 08:57:37 -07:00
macdonst
2d388025ad
Fix for Issue #257 : File Transfer with file:/// URIs
2011-10-04 11:53:46 -04:00
Bryce Curtis
424078432a
Add comments and rename loadWhiteList() to loadConfiguration().
2011-10-03 10:49:27 -05:00
Bryce Curtis
bb2bd22fad
Correct log level comparison.
2011-10-03 10:29:14 -05:00
Bryce Curtis
6b29787df7
Merge pull request #247 from brycecurtis/LOG
...
Formalize logging with printf-type optimization.
2011-10-03 08:24:13 -07:00
macdonst
804ac714ae
Updating version number to 1.1.0
2011-10-01 03:57:06 +08:00
macdonst
9ede0ceca1
Merge pull request #250 from macdonst/delcam
...
Fixing issues in the Camera code
2011-09-30 11:33:06 -07:00
macdonst
24ad506da5
Fixing JavaScript comparrison issues
2011-09-30 14:26:48 -04:00
macdonst
80695ec5e4
Fix issue with DATA_URL and refactor code
2011-09-30 11:30:04 -04:00
macdonst
6098f46d08
When you use the File API to remove a file need to check to see if we need to delete a row from the content store
2011-09-29 23:09:44 -04:00
macdonst
367d7500d5
Deletes any duplicate images taken by camera
2011-09-29 22:29:35 -04:00
macdonst
0d57404cf1
Merge pull request #249 from macdonst/gallery
...
Adding video select to getPicture to line up with iOS
2011-09-29 12:13:44 -07:00
macdonst
67393c516e
Adding video select to getPicture to line up with iOS
2011-09-29 14:49:34 -04:00
Bryce Curtis
ebb9f09168
Improve closing an HTML page and returning to previous page.
2011-09-29 11:02:54 -05:00
Bryce Curtis
a4d66c63a4
Call the initial onResume() on a plugin when it is created. This corrects the lifecycle behavior for plugins.
2011-09-28 22:40:53 -05:00
Bryce Curtis
6a9253e928
Formalize logging with printf-type optimization. Wrap Android log facilities instead of using System.out.println().
2011-09-28 22:19:23 -05:00
Bryce Curtis
0f988717d0
When app.exitApp() is called on multi-page app, pass to previous pages in stack and close them too.
2011-09-28 21:52:17 -05:00
Bryce Curtis
025577c41d
Add comment for method onOverrideUrlLoading()
2011-09-28 21:36:43 -05:00
macdonst
f271e2e0fa
Merge pull request #246 from macdonst/compass2
...
Fix for Issue #228 : Align Compass support with iOS
This is the second time I've had to merge this pull request.
2011-09-28 14:58:22 -07:00
macdonst
821eb24a54
Fix for Issue #228 : Align Compass support with iOS
2011-09-28 17:35:50 -04:00
