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
..
assistant	Merge remote-tracking branch 'linphone-android/master' into obiane	2016-02-18 15:56:50 +01:00
compatibility	Put sip address before numbers in contact view	2015-11-26 10:43:28 +01:00
gcm	Kill service when task manager kills UI and restart it when receiving push notification	2015-07-06 15:44:02 +02:00
sync	Re-add sip contact address	2015-03-25 17:14:27 +01:00
tutorials	Added setting to run tutorials directly from the app + updated README	2013-01-16 16:33:15 +01:00
ui	Merge remote-tracking branch 'linphone-android/master' into obiane	2015-11-30 14:29:14 +01:00
xmlrpc	Add fetch remote provisioning with xmlrpc	2015-11-03 18:43:04 +01:00
AboutFragment.java	Rework About fragment	2016-02-11 16:44:50 +01:00
AccountPreferencesFragment.java	Fix back in settings	2015-11-17 17:27:10 +01:00
BandwidthManager.java	update linphone submodule (jni for LinphoneEvent)	2013-06-18 22:14:10 +02:00
BluetoothManager.java	Fix bluetooth detection	2015-06-04 13:51:08 +02:00
BootReceiver.java	Back to dialer in settings and about	2015-11-17 17:27:09 +01:00
CallActivity.java	Merge remote-tracking branch 'linphone-android/master' into obiane	2016-02-18 15:56:50 +01:00
CallAudioFragment.java	Rename audio/video fragment	2015-10-15 18:04:07 +02:00
CallIncomingActivity.java	Merge remote-tracking branch 'linphone-android/master' into obiane	2016-02-18 15:56:50 +01:00
CallManager.java	update linphone and belle-sip, don't use LinphoneCore.createDefaultCallParameters() anymore.	2015-10-27 18:42:18 +01:00
CallOutgoingActivity.java	Merge remote-tracking branch 'linphone-android/master' into obiane	2016-02-18 15:56:50 +01:00
CallVideoFragment.java	Rename audio/video fragment	2015-10-15 18:04:07 +02:00
ChatFragment.java	Merge remote-tracking branch 'linphone-android/master' into obiane	2016-02-18 15:56:50 +01:00
ChatListFragment.java	Merge remote-tracking branch 'linphone-android/master' into obiane	2016-02-18 15:56:50 +01:00
ChatMessage.java	Chat importing finished for text messages (todo images) + waiting dialog during import	2013-08-19 11:17:35 +02:00
ChatStorage.java	Add chat edition for deleting chat message	2015-11-10 17:57:26 +01:00
Contact.java	Fix contact with linphone friend	2015-11-09 14:33:47 +01:00
ContactDetailsFragment.java	Merge remote-tracking branch 'linphone-android/master' into obiane	2016-02-18 15:56:50 +01:00
ContactEditorFragment.java	fix contact edit row ui	2016-02-11 16:45:34 +01:00
ContactsListFragment.java	Merge remote-tracking branch 'linphone-android/master' into obiane	2016-02-18 15:56:50 +01:00
ContactsManager.java	Merge remote-tracking branch 'linphone-android/master' into obiane	2016-02-18 15:56:50 +01:00
DialerFragment.java	Merge remote-tracking branch 'linphone-android/master' into obiane	2016-02-18 15:56:50 +01:00
EmptyFragment.java	Update fragment when item list removed	2016-02-18 11:18:02 +01:00
FragmentsAvailable.java	Update fragment when item list removed	2016-02-18 11:18:02 +01:00
HistoryDetailFragment.java	Merge remote-tracking branch 'linphone-android/master' into obiane	2016-02-18 15:56:50 +01:00
HistoryListFragment.java	Merge remote-tracking branch 'linphone-android/master' into obiane	2016-02-18 15:56:50 +01:00
KeepAliveHandler.java	enable mjpeg enc/dec from ffmpeg	2013-12-02 15:58:47 +01:00
KeepAliveReceiver.java	implement keep alive handler every 10mn	2013-03-26 15:59:09 +01:00
LinphoneActivity.java	Merge remote-tracking branch 'linphone-android/master' into obiane	2016-02-18 15:56:50 +01:00
LinphoneException.java	Add several new ui components.	2011-02-17 14:25:23 +01:00
LinphoneLauncherActivity.java	Merge remote-tracking branch 'linphone-android/master' into obiane	2016-02-18 15:56:50 +01:00
LinphoneManager.java	Merge remote-tracking branch 'linphone-android/master' into obiane	2016-02-18 15:56:50 +01:00
LinphonePreferences.java	Reworking assistant, add transport in login and fix error display	2016-01-11 10:31:16 +01:00
LinphoneService.java	Merge remote-tracking branch 'linphone-android/master' into obiane	2016-02-18 15:56:50 +01:00
LinphoneUtils.java	Merge remote-tracking branch 'linphone-android/master' into obiane	2015-11-30 14:29:14 +01:00
NetworkManager.java	Even better main/settings layout for best display on every screen + fix crazy fragments issue	2012-08-08 13:29:14 +02:00
OpenGLESDisplay.java	android: add opengl support for video display	2011-08-12 16:21:22 +02:00
PhoneStateChangedReceiver.java	Moved Log class from linphonecore to mediastreamer + use app name to tag app's logs	2012-12-27 11:22:12 +01:00
PreferencesMigrator.java	Re-add sip contact address	2015-03-25 17:14:27 +01:00
SettingsFragment.java	pref: remove qos algorithm choice	2016-01-21 10:35:35 +01:00
StatusFragment.java	fix ICE regression and fix blinking video statistics in StatusFragment	2016-01-25 22:34:45 +01:00
UIThreadDispatcher.java	fix crash due to thread calling things it should not call.	2015-01-16 12:10:19 +01:00