Commit graph

6 commits

Author SHA1 Message Date
Margaux Clerc
8793a506e3 Merge remote-tracking branch 'linphone-android/master' into obiane
Conflicts:
	res/drawable-xhdpi/checkbox_checked.png
	res/drawable-xhdpi/checkbox_unchecked.png
	res/drawable-xhdpi/resizable_textfield.9.png
	res/drawable/avatar_mask_chat.xml
	res/layout/about.xml
	res/layout/call.xml
	res/layout/call_inactive_row.xml
	res/layout/chat.xml
	res/layout/chat_bubble_incoming.xml
	res/layout/chat_bubble_outgoing.xml
	res/layout/chatlist.xml
	res/layout/contact.xml
	res/layout/contacts_list.xml
	res/layout/dialer.xml
	res/layout/history.xml
	res/layout/history_detail.xml
	res/layout/main.xml
	res/layout/search_contact_cell.xml
	res/layout/side_menu_account_cell.xml
	res/layout/side_menu_item_cell.xml
	res/layout/side_menu_main_account.xml
	res/values/non_localizable_custom.xml
	res/values/strings.xml
	res/values/styles.xml
	src/org/linphone/ChatFragment.java
	src/org/linphone/ContactsListFragment.java
	src/org/linphone/DialerFragment.java
	src/org/linphone/HistoryDetailFragment.java
	src/org/linphone/LinphoneActivity.java
	src/org/linphone/LinphoneService.java
2015-11-30 14:29:14 +01:00
Margaux Clerc
14c1609d95 Update views 2015-11-26 15:17:59 +01:00
Margaux Clerc
ffb1eccb24 Interface update 2015-11-05 16:23:59 +01:00
Margaux Clerc
6b6a39fddf Rename/clear assistant 2015-09-15 17:38:42 +02:00
Margaux Clerc
4c895ecb51 Update assistant 2015-09-01 11:18:37 +02:00
Margaux Clerc
cabecb97b2 Update UI contacts/dialer/chatlist and remove old assets 2015-08-03 12:25:05 +02:00
Renamed from res/layout/setup.xml (Browse further)