Guillaume Beraudo
013e835343
Merge branch 'video' of git.linphone.org:linphone-android-private
...
Conflicts:
libs/armeabi-v7a/liblinphone.so
libs/armeabi/liblinphone.so
src/org/linphone/core/LinphoneCallImpl.java
src/org/linphone/core/LinphoneProxyConfigImpl.java
src/org/linphone/core/tutorials/TutorialRegistrationActivity.java
submodules/linphone
2010-12-14 09:32:47 +01:00
Guillaume Beraudo
b9aea82101
Merge branch 'master' of git.linphone.org:linphone-android
2010-12-13 15:22:11 +01:00
Guillaume Beraudo
aa289edda1
Bind proxyconfig properties and update registration tutorial.
2010-12-13 15:21:12 +01:00
Guillaume Beraudo
5566daf9b1
Fixed and improved video test.
2010-12-09 09:08:12 +01:00
Guillaume Beraudo
16749d14d3
Simplify registration tutorial.
2010-12-07 10:32:52 +01:00
Guillaume Beraudo
b6db8240c4
Merge branch 'master' of git.linphone.org:linphone-android-private into video
...
+ some fixes.
Conflicts:
submodules/linphone
2010-12-01 13:40:57 +01:00
Jehan Monnier
f54a55d359
add proxy suport to TutorialBuddyStatusActivity
2010-11-30 19:02:11 +01:00
Guillaume Beraudo
3f7a0b217f
Added camera record manager to drive Video record class.
2010-11-29 12:08:13 +01:00
Jehan Monnier
1fead170d9
Merge remote branch 'bc/master' into video
2010-11-25 15:51:42 +01:00
Guillaume Beraudo
dc20fb7739
Moved mic and speaker buttons in dialer.
...
Added camera call button.
Added video preferences.
Share camera on received call according to preference settings.
Invite with(out) according to preference settings.
2010-11-25 11:13:28 +01:00
Guillaume Beraudo
37842c4b7c
First working Android video version.
2010-11-17 15:52:42 +01:00
Guillaume Beraudo
e9b5957dc3
Draft for Android video capture.
2010-11-12 14:16:01 +01:00
Guillaume Beraudo
299b7c95c3
Cleanup
2010-11-09 09:29:06 +01:00
Guillaume Beraudo
d68b8fb8ea
Added activities to support java port of the C tutorials.
2010-11-05 17:45:24 +01:00
