Commit Graph

24 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 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 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
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 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 799ce988d5 DroidGap.java changed to support demo2 inclusion 2009-01-14 12:25:31 -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 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
Joe Bowser b50f0c99e6 Testing the refactoring command 2008-11-28 11:30:30 -08:00