Commit graph

15 commits

Author SHA1 Message Date
Sylvain Berfini
babcbef93e Merge remote-tracking branch 'newui/newUI' into newUI
Conflicts:
	AndroidManifest.xml
	build.xml
	src/org/linphone/DialerActivity.java
	src/org/linphone/IncallActivity.java
	src/org/linphone/LinphoneManager.java
	src/org/linphone/LinphoneService.java
	src/org/linphone/LinphoneSimpleListener.java
	src/org/linphone/LinphoneUtils.java
	src/org/linphone/VideoCallActivity.java
	src/org/linphone/core/LinphoneCallImpl.java
	src/org/linphone/core/LinphoneCoreImpl.java
2012-07-11 11:53:33 +02:00
Sylvain Berfini
6dea1c450e Fix classpath to export xmlrpc lib in apk 2012-04-20 09:53:03 +02:00
Sylvain Berfini
0d575d5557 Wizard for Android 2012-02-02 10:34:29 +01:00
Sylvain Berfini
7f9f75768a Ant script for buildbot 2011-12-28 13:23:24 +01:00
Guillaume Beraudo
e63715f72f Remove test from .classpath. 2011-12-02 14:02:59 +01:00
Guillaume Beraudo
6bfe63cc93 Simple resume button in conferencing. 2011-10-21 14:21:40 +02:00
Guillaume Beraudo
8ffc8319fe Preliminary code for conferencing support. 2011-09-30 15:59:00 +02:00
Pierre-Eric Pelloux-Prayer
77898e052d New Mediastreamer Android Camera filter integration
android: new mediastreamer integration

android: new ms2 integration

Video calls minor corrections
2011-09-16 10:41:35 +02:00
Guillaume Beraudo
9d7c8c85d5 Fix build path. 2011-04-07 11:00:49 +02:00
Jehan Monnier
92dcddfdb0 add unit test for msandroid 2011-01-21 14:37:44 +01:00
Guillaume Beraudo
3137f9bb47 Added activities to support java port of the C tutorials. 2010-11-05 17:45:24 +01:00
Jehan Monnier
04b8dd948a add status bar 2010-05-02 19:23:44 +02:00
Jehan Monnier
1d9c04c08d put all dependencies in externals 2010-04-07 12:00:32 +02:00
Jehan Monnier
deb0d594ea add all deps as submodules 2010-04-07 09:09:56 +02:00
jehan
aae69af5c3 initial commit 2010-01-18 18:04:25 +01:00