Commit graph

8 commits

Author SHA1 Message Date
Brieuc Viel
105368e3c1 UI xml back up 2016-04-12 14:38:36 +02:00
Brieuc Viel
79cac9f3cd Merge remote-tracking branch 'public/master' into obiane 2016-04-11 16:25:40 +02:00
Margaux Clerc
9e34b10b5c Fix echo cancellation when creating a new account 2016-03-02 11:39:00 +01:00
Margaux Clerc
179546dacd Interface update and bug fixes 2016-02-22 11:16:39 +01:00
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
8f26fe7a23 Reworking assistant, add transport in login and fix error display 2016-01-11 10:31:16 +01:00
Margaux Clerc
ffb1eccb24 Interface update 2015-11-05 16:23:59 +01:00
Margaux Clerc
4c895ecb51 Update assistant 2015-09-01 11:18:37 +02:00