Commit Graph

54 Commits

Author SHA1 Message Date
Ray Vahey dfa2f0a802 fixed some merge problems 2009-03-09 09:45:35 +07:00
Ray Vahey a463aa2400 Merge branch 'master' of git://github.com/addios/phonegap
Conflicts:
	android/src/com/nitobi/phonegap/AudioHandler.java
	android/src/com/nitobi/phonegap/PhoneGap.java
2009-03-06 18:03:00 +07:00
addios e5934f6c58 Added comment about Directory management in Phonegap.java and changed Java Call backs to be int 2009-03-05 15:31:58 +07:00
addios 61078ac946 added audio output setting for android 2009-03-02 11:56:49 +07:00
rnvahey@gmail.com cb90eb73d7 Added streaming support for audio 2009-03-01 02:23:16 +07:00
addios c96e369351 Added phone information for android 2009-02-27 14:22:59 +07:00
addios bff74d9b5e Deleted bin directory 2009-02-27 12:11:51 +07:00
addios 3d9fdef7d3 Merge branch 'master' of git://github.com/Indeed/phonegap into phonegap2
Conflicts:
	android/assets/gap.js
	android/assets/index.html
	android/bin/DroidGap.apk
	android/bin/classes.dex
	android/bin/com/nitobi/phonegap/PhoneGap$1.class
	android/bin/com/nitobi/phonegap/PhoneGap$2.class
	android/bin/com/nitobi/phonegap/PhoneGap.class
	android/bin/resources.ap_
	android/src/com/nitobi/phonegap/PhoneGap.java
2009-02-27 11:47:10 +07:00
rnvahey@gmail.com c676865cfb android Audio recording/playback and progress bar info 2009-02-26 23:39:17 +07:00
addios aba625b6a9 Added directoryManager for android 2009-02-26 11:50:11 +07:00
rnvahey@gmail.com a7f45f18d6 Backup 20090225 2009-02-25 16:28:02 +07:00
rnvahey@gmail.com 62961fb95d added HTTP get support for Android 2009-02-25 15:56:43 +07:00
rnvahey@gmail.com 0e2d4d6af7 removed some dev comments 2009-02-25 00:07:14 +07:00
rnvahey@gmail.com d8a46494ec added sms receiver functionality to android 2009-02-24 23:12:37 +07:00
rnvahey@gmail.com 4993c1bf87 added SMS receive functionality 2009-02-24 22:45:42 +07:00
Brock Whitten 294694ef5d merge sharemes changes 2009-02-13 16:27:21 -08:00
Brock Whitten fdfb6313b4 Merge branch 'master' of git://github.com/shareme/phonegap into shareme 2009-02-13 16:18:24 -08:00
Brock Whitten 3aae3e04d1 added rakefile for performing various tasks 2009-01-23 10:36:13 -08:00
Fred Grott 88b71cf553 created some new functions to enale GPS/Accel value polling. GPS wise demo2 was changed so that we can do both change GPS in non gps suported cases and in GPS supported cases red Gps via polling 2009-01-19 06:59:54 -06:00
Fred Grott bcb7805006 one panel is user updates GPS other is automaic via pollling 2009-01-18 16:00:53 -06:00
Fred Grott 4b6dc97880 added phonegap icon to demo2 2009-01-16 07:57:14 -06:00
Fred Grott 6e59af7e0c half GPS problems fixed..Device.Location.init works nd can get first GPS read 2009-01-16 07:02:43 -06:00
Fred Grott fe74ca3ec7 more changes to debug GPS 2009-01-15 07:47:16 -06:00
Fred Grott 4cd7985448 start adding stuff and alerts to debug GPS, PLaySOund, and Accelerometer and PhoneGap.java corrected to match my Gap.js changes 2009-01-14 14:38:35 -06:00
Fred Grott 71600b0916 added iBug from JoeHewitt.com support so can further debug the js 2009-01-14 13:11:47 -06:00
Fred Grott 799ce988d5 DroidGap.java changed to support demo2 inclusion 2009-01-14 12:25:31 -06:00
Fred Grott 6448e16d82 added demo2 stuff so that any PhoneGap_andorid library user can run demo2 and see it working 2009-01-14 11:44:48 -06:00
Fred Grott ba73ad2a29 forgot the not Gap supported device if statement in my gap.js modifications 2009-01-14 06:59:18 -06:00
Fred Grott ee2d4f7200 added assets folder and modified gap.js file
gap.js modfied to get Android stuff working, can now read OS properties via javascript and phoenGap properties
2009-01-13 11:26:10 -06:00
Fred Grott 1e19ed6bcf added copyright license blurbs 2009-01-13 10:58:59 -06:00
Joe Bowser 9704e63399 Adding sound to Android 2008-12-18 16:37:52 -08:00
Joe Bowser fca16adf1d Adding Sound to Android PhoneGap 2008-12-18 16:36:11 -08:00
Joe Bowser a32ae0f28a Updating android 2008-12-18 15:22:43 -08:00
Joe Bowser 18fd54b9c0 Merging master into the Nitobi Github Branch
Merge branch 'master' of git://github.com/sintaxi/phonegap

Conflicts:

	android/src/com/android/droidgap/DroidGap.java
2008-12-18 15:21:04 -08:00
Joe Bowser 91d93deabb Removing old code 2008-12-18 15:13:30 -08:00
Brock Whitten c9e7a5d9e4 Merge branch 'master' of git://github.com/nitobi/phonegap into joe 2008-11-28 16:18:48 -08:00
Joe Bowser 65b401d477 Adding Preliminary Camera Support for Android in PhoneGap.
(Note: This has not been tested yet)
2008-11-28 16:14:51 -08:00
Joe Bowser 9574e509e2 Preliminary Accelerometer Support for Android! 2008-11-28 14:58:51 -08:00
Brock Whitten 53cdce1b1e resolved android naming conflict 2008-11-28 13:58:41 -08:00
Joe Bowser b50f0c99e6 Testing the refactoring command 2008-11-28 11:30:30 -08:00
Igor Faletski ab6df0d5cf resolving merge changes 2008-11-17 14:47:02 -08:00
Igor Faletski 925ff53848 custom android changes 2008-11-17 14:45:43 -08:00
Joe Bowser b75fdf8610 More changes to the namespaces 2008-11-17 14:03:21 -08:00
Joe Bowser ceb2dd61c2 Fixed the Geolocation Functionality. If it is able to get the location, it will get it from the
GPS first, then the network.
2008-11-17 14:01:45 -08:00
Joe Bowser 337acc92ea Changing the classname of the Android Branch. The package should be reflective of the company that wrote it.
(Note: This needs to be changed for every app on the android)
2008-11-17 11:12:16 -08:00
Igor Faletski 4282a3c3bf customizing droid gap 2008-11-16 15:49:08 -08:00
Joe Bowser 4820f7c030 Merge commit 'HEAD'; branch 'droidgap'
Conflicts:

	android/src/com/android/droidgap/PhoneGap.java
2008-10-22 13:14:16 -07:00
Joe Bowser 782310849f Latest PhoneGap Source 2008-10-22 13:07:33 -07:00
Joe Bowser 2337509c15 Added helpers to make life easier 2008-10-17 11:04:18 -07:00
Joe Bowser c42a0ae5e2 Forgot to move the manifest to the branch 2008-10-16 13:23:10 -07:00