Margaux Clerc 0da687df64 Merge branch 'master' into dev_in_app_purchase ... Conflicts: AndroidManifest.xml res/raw/linphonerc_factory res/values/non_localizable_custom.xml res/xml/preferences.xml src/org/linphone/LinphonePreferences.java src/org/linphone/SettingsFragment.java src/org/linphone/compatibility/ApiFivePlus.java src/org/linphone/setup/SetupActivity.java src/org/linphone/xmlrpc/XmlRpcHelper.java src/org/linphone/xmlrpc/XmlRpcListener.java src/org/linphone/xmlrpc/XmlRpcListenerBase.java		2016-06-28 14:56:42 +02:00
..
about.xml	Update content description for accessibility	2016-03-23 11:59:52 +01:00
assistant.xml	Reworking assistant, add transport in login and fix error display	2016-01-11 10:31:16 +01:00
assistant_account_creation.xml	Update content description for accessibility	2016-03-23 11:59:52 +01:00
assistant_account_creation_activation.xml	Update content description for accessibility	2016-03-23 11:59:52 +01:00
assistant_ec_calibration.xml	Fix assistant creation and login	2016-01-20 17:40:09 +01:00
assistant_linphone_login.xml	Update content description for accessibility	2016-03-23 11:59:52 +01:00
assistant_login.xml	Update content description for accessibility	2016-03-23 11:59:52 +01:00
assistant_remote_provisioning.xml	Update content description for accessibility	2016-03-23 11:59:52 +01:00
assistant_remote_provisioning_login.xml	Add missing strings	2016-02-09 10:28:56 +01:00
assistant_topbar.xml	Update content description for accessibility	2016-03-23 11:59:52 +01:00
assistant_welcome.xml	Fix tablet portrait ui	2016-02-10 14:27:07 +01:00
audio.xml	Rework Incall view/Chat view/Edit Contact view	2015-08-25 17:23:07 +02:00
call.xml	Update content description for accessibility	2016-03-23 11:59:52 +01:00
call_inactive_row.xml	Fix landscape graphics	2015-11-26 10:43:28 +01:00
call_incoming.xml	Rework disabled images and call activity button	2016-02-26 09:29:59 +01:00
call_outgoing.xml	Fix call button size	2016-03-02 17:34:24 +01:00
chat.xml	Update content description for accessibility	2016-03-23 11:59:52 +01:00
chat_bubble_incoming.xml	Update content description for accessibility	2016-03-23 11:59:52 +01:00
chat_bubble_outgoing.xml	Fix edit chat incoming bubble	2016-02-24 12:20:44 +01:00
chatlist.xml	Update content description for accessibility	2016-03-23 11:59:52 +01:00
chatlist_cell.xml	Update content description for accessibility	2016-03-23 11:59:52 +01:00
conf_call_control_row.xml	Update content description for accessibility	2016-03-23 11:59:52 +01:00
conference_header.xml	Fix conference pause, keyboard show/hide in assistant and some UI tests	2016-02-15 17:30:24 +01:00
conference_paused_row.xml	Fix conference pause, keyboard show/hide in assistant and some UI tests	2016-02-15 17:30:24 +01:00
contact.xml	Update content description for accessibility	2016-03-23 11:59:52 +01:00
contact_cell.xml	Update content description for accessibility	2016-03-23 11:59:52 +01:00
contact_control_row.xml	Update content description for accessibility	2016-03-23 11:59:52 +01:00
contact_edit.xml	Fixed hide_[phone_numbers/sip_addresses]_in_editor custom	2016-03-23 11:59:52 +01:00
contact_edit_row.xml	Fix contact edition	2016-02-22 15:18:58 +01:00
contacts_list.xml	Improved fastscroll to use Linphone colors instead of Android holo theme	2016-03-23 12:00:24 +01:00
dialer.xml	Update content description for accessibility	2016-03-23 11:59:52 +01:00
dialog.xml	Fix tests	2016-02-15 13:57:23 +01:00
edit_list.xml	Update content description for accessibility	2016-03-23 11:59:52 +01:00
empty_fragment.xml	Update fragment when item list removed	2016-02-18 11:18:02 +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 content description for accessibility	2016-03-23 11:59:52 +01:00
history_cell.xml	Update content description for accessibility	2016-03-23 11:59:52 +01:00
history_detail.xml	Update content description for accessibility	2016-03-23 11:59:52 +01:00
in_app_purchasable.xml	Merge branch 'master' into dev_in_app_purchase	2016-06-28 14:56:42 +02:00
in_app_store.xml	Merge branch 'master' into dev_in_app_purchase	2016-06-28 14:56:42 +02: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	Update Linphone Main with side menu/ Dialer	2015-09-18 18:08:44 +02:00
main.xml	Update content description for accessibility	2016-03-23 11:59:52 +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
progress_dialog.xml	Add inprogress popup assistant registration in progress	2016-02-22 14:20:04 +01:00
remote_provisioning.xml	Add missing strings	2016-02-09 10:28:56 +01:00
search_contact_cell.xml	Fix crash in chat	2015-11-26 10:43:28 +01:00
settings.xml	Bad layout for preferences fixed	2012-08-29 17:37:11 +02:00
side_menu_account_cell.xml	Adjust size	2016-01-21 17:08:01 +01:00
side_menu_item_cell.xml	Adjust size	2016-01-21 17:08:01 +01:00
side_menu_main_account.xml	Update content description for accessibility	2016-03-23 11:59:52 +01:00
status.xml	Update content description for accessibility	2016-03-23 11:59:52 +01:00
toast.xml	Remove old assets and colors	2015-10-15 10:59:47 +02:00
tuto_carddav.xml	Added CardDAV tutorial from dev_vcard branch	2016-03-23 11:59:52 +01:00
tutorials.xml	Added CardDAV tutorial from dev_vcard branch	2016-03-23 11:59:52 +01:00
video.xml	Code optimizations	2012-08-06 17:30:40 +02:00
video_no_opengl.xml	Fixed crash at end on video call for a specific samsung device (GT-S7580)	2016-04-01 13:58:14 +02:00
zrtp_dialog.xml	Remove old assets and colors	2015-10-15 10:59:47 +02:00