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
..
add_call_button.xml	Add missing files	2015-11-05 16:24:46 +01:00
assistant_button.xml	Merge remote-tracking branch 'linphone-android/master' into obiane	2016-02-18 15:56:50 +01:00
assistant_button_text_color.xml	Reworking assistant, add transport in login and fix error display	2016-01-11 10:31:16 +01:00
back_button.xml	Add missing files	2015-11-05 16:24:46 +01:00
backspace_disabled.xml	Interface update	2015-11-05 16:23:59 +01:00
button_back_background.xml	Add missing files	2015-11-05 16:24:46 +01:00
button_background.xml	Interface update	2015-11-05 16:23:59 +01:00
button_call_background.xml	Add missing files	2015-11-05 16:24:46 +01:00
call.xml	Interface update	2015-11-05 16:23:59 +01:00
call_alt_start_button.xml	Merge remote-tracking branch 'private/3.0.X' into obiane	2015-11-09 14:16:42 +01:00
call_back_button.xml	Merge remote-tracking branch 'private/3.0.X' into obiane	2015-11-09 14:16:42 +01:00
call_start_button.xml	Add missing files	2015-11-05 16:24:46 +01:00
cancel_button.xml	Add missing files	2015-11-05 16:24:46 +01:00
chat.xml	Update ui	2015-11-09 14:27:03 +01:00
chat_add_button.xml	Add missing files	2015-11-05 16:24:46 +01:00
chat_send_file.xml	Add new items for chat	2015-09-01 15:12:45 +02:00
chat_send_message.xml	Chat update	2015-08-03 14:46:51 +02:00
chat_start_button.xml	Add missing files	2015-11-05 16:24:46 +01:00
checkbox.xml	Add new assets	2015-09-02 09:26:35 +02:00
clean_field_button.xml	Add missing files	2015-11-05 16:24:46 +01:00
conference_button.xml	Add missing files	2015-11-05 16:24:46 +01:00
contact_add_button.xml	Interface update	2015-11-05 16:23:59 +01:00
contact_add_disabled.xml	Fix merge	2015-11-30 14:29:39 +01:00
delete_button.xml	Add missing files	2015-11-05 16:24:46 +01:00
deselect_all_button.xml	Add missing files	2015-11-05 16:24:46 +01:00
dialer.xml	Change image alpha	2015-11-09 14:25:40 +01:00
dialer_back_button.xml	Merge remote-tracking branch 'private/3.0.X' into obiane	2015-11-09 14:16:42 +01:00
edit_list_button.xml	Interface update	2015-11-05 16:23:59 +01:00
edit_list_disabled.xml	Fix edit mode in history	2015-09-07 17:16:32 +02:00
erase_button.xml	Add missing files	2015-11-05 16:24:46 +01:00
footer_button.xml	Rework Incall view/Chat view/Edit Contact view	2015-08-25 17:23:07 +02:00
hangup.xml	Interface update	2015-11-05 16:23:59 +01:00
history_all_button.xml	Add missing files	2015-11-05 16:24:46 +01:00
history_missed_button.xml	Add missing files	2015-11-05 16:24:46 +01:00
list_delete.xml	Interface update	2015-11-05 16:23:59 +01:00
list_detail.xml	Update History	2015-09-04 12:04:06 +02:00
list_selector.xml	Fix edit mode in history	2015-09-07 17:16:32 +02:00
menu_burger.xml	Update assistant	2015-09-01 11:18:37 +02:00
menu_disabled.xml	Update assistant	2015-09-01 11:18:37 +02:00
numpad_eight.xml	Rework numpad	2015-09-01 15:09:13 +02:00
numpad_five.xml	Rework numpad	2015-09-01 15:09:13 +02:00
numpad_four.xml	Rework numpad	2015-09-01 15:09:13 +02:00
numpad_nine.xml	Rework numpad	2015-09-01 15:09:13 +02:00
numpad_one.xml	Rework numpad	2015-09-01 15:09:13 +02:00
numpad_seven.xml	Rework numpad	2015-09-01 15:09:13 +02:00
numpad_sharp.xml	Rework numpad	2015-09-01 15:09:13 +02:00
numpad_six.xml	Rework numpad	2015-09-01 15:09:13 +02:00
numpad_star_digit.xml	Add new assets	2015-10-15 11:07:41 +02:00
numpad_three.xml	Rework numpad	2015-09-01 15:09:13 +02:00
numpad_two.xml	Rework numpad	2015-09-01 15:09:13 +02:00
numpad_zero.xml	Rework numpad	2015-09-01 15:09:13 +02:00
pause.xml	Interface update	2015-11-05 16:23:59 +01:00
quit.xml	Update Linphone Main with side menu/ Dialer	2015-09-18 18:08:44 +02:00
select_all_button.xml	Add missing files	2015-11-05 16:24:46 +01:00
status_level.xml	Rename package name and logo	2015-12-08 17:09:33 +01:00
switch_camera.xml	Remove/add assets	2015-07-27 16:26:26 +02:00
transfer_button.xml	Add missing files	2015-11-05 16:24:46 +01:00