Commit graph

1632 commits

Author SHA1 Message Date
Margaux Clerc
1b207c8dc1 Merge remote-tracking branch 'linphone-android/master' into obiane
Conflicts:
	AndroidManifest.xml
	res/drawable-xhdpi/topbar_avatar.png
	res/drawable/assistant_button.xml
	res/layout-land/call.xml
	res/layout-land/call_incoming.xml
	res/layout-land/call_outgoing.xml
	res/layout-land/chatlist_cell.xml
	res/layout-land/main.xml
	res/layout/about.xml
	res/layout/assistant_account_creation.xml
	res/layout/assistant_linphone_login.xml
	res/layout/assistant_remote_provisioning_login.xml
	res/layout/assistant_topbar.xml
	res/layout/call.xml
	res/layout/call_incoming.xml
	res/layout/call_outgoing.xml
	res/layout/chat.xml
	res/layout/chatlist.xml
	res/layout/chatlist_cell.xml
	res/layout/conference_paused_row.xml
	res/layout/contact.xml
	res/layout/contact_edit.xml
	res/layout/contacts_list.xml
	res/layout/dialog.xml
	res/layout/edit_list.xml
	res/layout/history.xml
	res/layout/history_detail.xml
	res/layout/main.xml
	res/layout/side_menu_account_cell.xml
	res/mipmap-hdpi/ic_launcher.png
	res/mipmap-mdpi/ic_launcher.png
	res/mipmap-xhdpi/ic_launcher.png
	res/mipmap-xxhdpi/ic_launcher.png
	res/mipmap-xxxhdpi/ic_launcher.png
	res/values-ar/strings.xml
	res/values-de/strings.xml
	res/values-es/strings.xml
	res/values-fr/custom.xml
	res/values-fr/strings.xml
	res/values-he/strings.xml
	res/values-ja/strings.xml
	res/values-nl/strings.xml
	res/values-ru/strings.xml
	res/values-tr/strings.xml
	res/values/custom.xml
	res/values/non_localizable_custom.xml
	res/values/strings.xml
	res/values/styles.xml
	src/org/linphone/CallActivity.java
	src/org/linphone/ChatFragment.java
	src/org/linphone/ChatListFragment.java
	src/org/linphone/ContactDetailsFragment.java
	src/org/linphone/ContactsListFragment.java
	src/org/linphone/HistoryDetailFragment.java
	src/org/linphone/HistoryListFragment.java
	src/org/linphone/LinphoneActivity.java
	src/org/linphone/LinphoneManager.java
	src/org/linphone/LinphoneService.java
	src/org/linphone/assistant/RemoteProvisioningActivity.java
2016-02-18 15:56:50 +01:00
Margaux Clerc
7687c00aac Update fragment when item list removed 2016-02-18 11:18:02 +01:00
Margaux Clerc
f68df2c584 Tablet: Fix new chat conversation and display first listview element 2016-02-17 15:19:26 +01:00
Margaux Clerc
095d562ed0 Fix tests crash and fix video call pause button 2016-02-16 10:32:55 +01:00
Margaux Clerc
e10a0d0ab0 Fix conference pause, keyboard show/hide in assistant and some UI tests 2016-02-15 17:30:24 +01:00
Margaux Clerc
45b365ecb1 Fix tests 2016-02-15 13:57:23 +01:00
Margaux Clerc
56a82f7165 Fix new chat conversation 2016-02-15 11:00:04 +01:00
Margaux Clerc
30b25c32e8 Tablet: Add new dialer and fix edit in chat list 2016-02-12 17:43:35 +01:00
Margaux Clerc
794a39f075 Fix message notification 2016-02-12 10:46:12 +01:00
Margaux Clerc
27eb40f4be Resore add contact button in history for tablet version 2016-02-11 16:46:40 +01:00
Margaux Clerc
2e34cf941d fix contact edit row ui 2016-02-11 16:45:34 +01:00
Margaux Clerc
cb14535ab7 Rework About fragment 2016-02-11 16:44:50 +01:00
Simon Morlat
5b850e7b23 remove all references to application paths in linphonerc 2016-02-10 17:15:24 +01:00
Margaux Clerc
2ea62bb0c9 Fix fragment back button and add cancel button for contact editor 2016-02-10 14:27:14 +01:00
Margaux Clerc
9ad4962aa0 Add missing strings 2016-02-09 10:28:56 +01:00
Margaux Clerc
bf62766a4e Fix conference issues 2016-02-09 10:28:56 +01:00
Margaux Clerc
752381e71c Fix edit in contacts list 2016-02-08 11:55:29 +01:00
Sylvain Berfini
644430db5c Removed static import 2016-02-05 17:22:04 +01:00
Sylvain Berfini
4ad4873907 Fixed issue 2846 2016-02-05 17:19:12 +01:00
Simon Morlat
01f24d00a3 use low bandwidth mode also for incoming calls 2016-02-01 10:39:46 +01:00
Sylvain Berfini
9204c83c0b Updated procedure for change package name + fixed crash when contacts sync account creation failed 2016-01-29 10:58:37 +01:00
Simon Morlat
4f89dc65c7 fix ICE regression and fix blinking video statistics in StatusFragment 2016-01-25 22:34:45 +01:00
Sylvain Berfini
587a2bff50 Fix transfer 2016-01-22 10:15:06 +01:00
Simon Morlat
67b0bd853d fix broken compilation 2016-01-21 19:30:07 +01:00
Margaux Clerc
0b867f947f Fix call errors and add portrait support for tablet 2016-01-21 17:08:01 +01:00
Margaux Clerc
b691e107e3 Rework new conversation display 2016-01-21 17:08:01 +01:00
Margaux Clerc
b93c885b7e Hide logo and notifcation from lockscreen 2016-01-21 17:08:01 +01:00
Gautier Pelloux-Prayer
520e16a514 pref: remove qos algorithm choice 2016-01-21 10:35:35 +01:00
Margaux Clerc
7a418133c0 Fix assistant creation and login 2016-01-20 17:40:09 +01:00
Sylvain Berfini
1969b2ccf7 Always ask user to validate zrtp sas 2016-01-20 15:11:53 +01:00
Margaux Clerc
2e0985d740 Fix avatar in notification and fix remove chatroom 2016-01-19 11:52:28 +01:00
Margaux Clerc
16f69d4606 Fix app icon for old android version 2016-01-19 11:30:31 +01:00
Margaux Clerc
be8dc562ec Fix error display 2016-01-19 11:27:36 +01:00
Margaux Clerc
6b90adf155 Remove back button on tablet fragment 2016-01-19 09:26:35 +01:00
Margaux Clerc
25dc639ded Update strings 2016-01-19 09:26:35 +01:00
Margaux Clerc
8b17db5997 Fix audio view when video is removed by remote 2016-01-19 09:26:35 +01:00
Jehan Monnier
8cb4bb4517 make sure single video activity is created 2016-01-18 17:39:29 +01:00
Margaux Clerc
bbd94da62e Add layout for tablet 2016-01-18 13:43:42 +01:00
Margaux Clerc
c122e5d2bc Turn off screen with proximity sensor 2016-01-15 14:17:21 +01:00
Margaux Clerc
253a699837 Restore state for speaker/mute in call 2016-01-14 14:58:59 +01:00
Margaux Clerc
626be7718f Change launch icons 2016-01-13 09:31:47 +01:00
Margaux Clerc
2f73b26325 Fix chatroom selection 2016-01-12 10:07:50 +01:00
Margaux Clerc
003b21102b Rework topbar 2016-01-11 10:31:16 +01:00
Margaux Clerc
594bc9fbf3 Fix image problem in chat list 2016-01-11 10:31:16 +01:00
Margaux Clerc
8f26fe7a23 Reworking assistant, add transport in login and fix error display 2016-01-11 10:31:16 +01:00
Margaux Clerc
71926ccd16 Fix UI problems and linphone friend display name 2015-12-08 17:14:24 +01:00
Margaux Clerc
72328025d2 Fix merge 2015-12-08 17:13:12 +01:00
Margaux Clerc
c3027ec959 Rework remote provisioning 2015-12-08 17:10:21 +01:00
Margaux Clerc
e4c13e25cc Rename package name and logo 2015-12-08 17:09:33 +01:00
Margaux Clerc
96e27f63f3 Fix merge 2015-11-30 14:29:39 +01:00