linphone-android/res/layout
Margaux Clerc 410f168acf Merge remote-tracking branch 'private/3.0.X' into obiane
Conflicts:
	AndroidManifest.xml
	res/drawable/status_level.xml
	res/layout/call.xml
	res/layout/chat.xml
	res/layout/chat_bubble_outgoing.xml
	res/layout/contact_control_row.xml
	res/layout/search_contact_cell.xml
	res/values/strings.xml
	src/org/linphone/CallActivity.java
	src/org/linphone/ChatFragment.java
	src/org/linphone/ContactDetailsFragment.java
	src/org/linphone/LinphoneService.java
2015-11-16 09:06:12 +01:00
..
about.xml Interface update 2015-11-05 16:23:59 +01:00
accounts.xml Interface update 2015-11-05 16:23:59 +01:00
assistant.xml Interface update 2015-11-05 16:23:59 +01:00
assistant_account_creation.xml Interface update 2015-11-05 16:23:59 +01:00
assistant_account_creation_activation.xml Rename/clear assistant 2015-09-15 17:38:42 +02:00
assistant_ec_calibration.xml Update assistant 2015-09-01 11:18:37 +02:00
assistant_linphone_login.xml Interface update 2015-11-05 16:23:59 +01:00
assistant_login.xml Fix assistant and test 2015-11-13 11:07:06 +01:00
assistant_remote_provisioning.xml Add fetch remote provisioning with xmlrpc 2015-11-03 18:43:04 +01:00
assistant_remote_provisioning_login.xml Interface update 2015-11-05 16:23:59 +01:00
assistant_topbar.xml Interface update 2015-11-05 16:23:59 +01:00
assistant_welcome.xml Rename/clear assistant 2015-09-15 17:38:42 +02:00
audio.xml Interface update 2015-11-05 16:23:59 +01:00
call.xml Merge remote-tracking branch 'private/3.0.X' into obiane 2015-11-16 09:06:12 +01:00
call_inactive_row.xml Interface update 2015-11-05 16:23:59 +01:00
call_incoming.xml Interface update 2015-11-05 16:23:59 +01:00
call_outgoing.xml Interface update 2015-11-05 16:23:59 +01:00
chat.xml Merge remote-tracking branch 'private/3.0.X' into obiane 2015-11-16 09:06:12 +01:00
chat_bubble_incoming.xml Merge remote-tracking branch 'private/3.0.X' into obiane 2015-11-16 09:06:12 +01:00
chat_bubble_outgoing.xml Merge remote-tracking branch 'private/3.0.X' into obiane 2015-11-16 09:06:12 +01:00
chatlist.xml Add chat in call and fix call problems 2015-11-09 14:31:40 +01:00
chatlist_cell.xml Interface update 2015-11-05 16:23:59 +01:00
conf_call_control_row.xml Add chat in call and fix call problems 2015-11-09 14:31:40 +01:00
conference_header.xml Interface update 2015-11-05 16:23:59 +01:00
conference_paused_row.xml Conference paused is now working 2015-11-10 17:58:59 +01:00
contact.xml Interface update 2015-11-05 16:23:59 +01:00
contact_cell.xml Interface update 2015-11-05 16:23:59 +01:00
contact_control_row.xml Merge remote-tracking branch 'private/3.0.X' into obiane 2015-11-16 09:06:12 +01:00
contact_edit_row.xml Interface update 2015-11-05 16:23:59 +01:00
contacts_list.xml Interface update 2015-11-05 16:23:59 +01:00
dialer.xml Interface update 2015-11-05 16:23:59 +01:00
dialog.xml Interface update 2015-11-05 16:23:59 +01:00
edit_contact.xml Interface update 2015-11-05 16:23:59 +01:00
edit_list.xml Interface update 2015-11-05 16:23:59 +01:00
hello_world.xml Liblinphone updated (fix) + tutorials back 2013-01-16 16:06:57 +01:00
hidden.xml Hidden layout for hidding preferences 2011-03-11 15:35:37 +01:00
history.xml Update ui 2015-11-09 14:27:03 +01:00
history_cell.xml Interface update 2015-11-05 16:23:59 +01:00
history_detail.xml Interface update 2015-11-05 16:23:59 +01:00
incall_stats.xml Remove old assets and colors 2015-10-15 10:59:47 +02:00
input_dialog.xml Add errors in assistant 2015-10-26 19:07:13 +01:00
launch_screen.xml Interface update 2015-11-05 16:23:59 +01:00
main.xml Fix contact with linphone friend 2015-11-09 14:33:47 +01:00
numpad.xml Rework and rename incoming call and outgoing call activity 2015-10-15 17:56:27 +02:00
preference_led.xml Colored led for account status in preferences 2012-09-04 09:43:59 +02:00
preference_list_content.xml First step for fragment preferences 2012-08-29 13:21:08 +02:00
remote_provisioning.xml Rework Incall view/Chat view/Edit Contact view 2015-08-25 17:23:07 +02:00
search_contact_cell.xml Merge remote-tracking branch 'private/3.0.X' into obiane 2015-11-16 09:06:12 +01:00
settings.xml Bad layout for preferences fixed 2012-08-29 17:37:11 +02:00
side_menu_default_account.xml Interface update 2015-11-05 16:23:59 +01:00
side_menu_item.xml Interface update 2015-11-05 16:23:59 +01:00
status.xml Interface update 2015-11-05 16:23:59 +01:00
toast.xml Interface update 2015-11-05 16:23:59 +01:00
tutorials.xml Added setting to run tutorials directly from the app + updated README 2013-01-16 16:33:15 +01:00
video.xml Code optimizations 2012-08-06 17:30:40 +02:00