Commit graph

9 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
fc96a26de9 Fix landscape graphics 2015-11-26 10:43:28 +01:00
Margaux Clerc
ffb1eccb24 Interface update 2015-11-05 16:23:59 +01:00
Margaux Clerc
c6035e841f Add chat view and otger stuff 2015-09-18 18:57:49 +02:00
Margaux Clerc
3eca96e3c5 Rework Incall view/Chat view/Edit Contact view 2015-08-25 17:23:07 +02:00
Margaux Clerc
219b3005f8 Rework views history/contacts/chat with the new design 2015-07-30 15:46:28 +02:00
Sylvain Berfini
a7f77655d3 Reworked incall audio interface 2012-11-19 12:54:23 +01:00
Sylvain Berfini
a0caddeb8b Interface improved 2012-09-20 11:52:32 +02:00
Sylvain Berfini
5c20b51d19 Conference OK 2012-09-19 16:43:16 +02:00