Commit graph

849 commits

Author SHA1 Message Date
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
Margaux Clerc
7687c00aac Update fragment when item list removed 2016-02-18 11:18:02 +01:00
Margaux Clerc
3866fde790 Update translations 2016-02-17 15:19:25 +01:00
Margaux Clerc
e10a0d0ab0 Fix conference pause, keyboard show/hide in assistant and some UI tests 2016-02-15 17:30:24 +01:00
Margaux Clerc
45b365ecb1 Fix tests 2016-02-15 13:57:23 +01:00
Margaux Clerc
56a82f7165 Fix new chat conversation 2016-02-15 11:00:04 +01:00
Margaux Clerc
30b25c32e8 Tablet: Add new dialer and fix edit in chat list 2016-02-12 17:43:35 +01:00
Margaux Clerc
1b679034f4 Add about landscape version 2016-02-11 16:46:59 +01:00
Margaux Clerc
99d6c60733 Fix landscape version 2016-02-11 16:45:56 +01:00
Margaux Clerc
2e34cf941d fix contact edit row ui 2016-02-11 16:45:34 +01:00
Margaux Clerc
cb14535ab7 Rework About fragment 2016-02-11 16:44:50 +01:00
Simon Morlat
5b850e7b23 remove all references to application paths in linphonerc 2016-02-10 17:15:24 +01:00
Margaux Clerc
2ea62bb0c9 Fix fragment back button and add cancel button for contact editor 2016-02-10 14:27:14 +01:00
Margaux Clerc
90c5faa6f8 Fix tablet portrait ui 2016-02-10 14:27:07 +01:00
Margaux Clerc
b50f326a62 Fix icons size 2016-02-09 11:36:02 +01:00
Margaux Clerc
3f58385377 Update translations 2016-02-09 11:24:53 +01:00
Margaux Clerc
0f8d130d96 Re fix missing string 2016-02-09 10:40:13 +01:00
Margaux Clerc
9ad4962aa0 Add missing strings 2016-02-09 10:28:56 +01:00
Jehan Monnier
0c0812628f fix linphonerc_factory for tablets 2016-02-01 13:36:39 +01:00
Sylvain Berfini
9204c83c0b Updated procedure for change package name + fixed crash when contacts sync account creation failed 2016-01-29 10:58:37 +01:00
Margaux Clerc
7f39dcf561 Adjust size 2016-01-21 17:08:01 +01:00
Margaux Clerc
b691e107e3 Rework new conversation display 2016-01-21 17:08:01 +01:00
Gautier Pelloux-Prayer
f5fbf4f92e i18n: update texts 2016-01-21 10:35:35 +01:00
Gautier Pelloux-Prayer
520e16a514 pref: remove qos algorithm choice 2016-01-21 10:35:35 +01:00
Margaux Clerc
cc069789b9 Fix video resized in full screen 2016-01-20 17:40:09 +01:00
Margaux Clerc
7a418133c0 Fix assistant creation and login 2016-01-20 17:40:09 +01:00
Sylvain Berfini
abd34977ca Fix opacity issue on some devices 2016-01-20 15:06:37 +01:00
Margaux Clerc
2e0985d740 Fix avatar in notification and fix remove chatroom 2016-01-19 11:52:28 +01:00
Margaux Clerc
6dfd89c759 Update translation 2016-01-19 11:30:58 +01:00
Margaux Clerc
16f69d4606 Fix app icon for old android version 2016-01-19 11:30:31 +01:00
Margaux Clerc
820f042bb0 Fix strings 2016-01-19 10:50:31 +01:00
Margaux Clerc
789568b60e Update launchscreen title 2016-01-19 10:27:15 +01:00
Margaux Clerc
6b90adf155 Remove back button on tablet fragment 2016-01-19 09:26:35 +01:00
Margaux Clerc
25dc639ded Update strings 2016-01-19 09:26:35 +01:00
Margaux Clerc
bbd94da62e Add layout for tablet 2016-01-18 13:43:42 +01:00
Margaux Clerc
5501dd26d5 Remove unused drawable 2016-01-15 14:21:38 +01:00
Margaux Clerc
2207df26da Fix size of notifcation and status menu 2016-01-14 14:58:08 +01:00
Margaux Clerc
18c97f65d1 Allow ipv6 instead of Use IPv6 instead of IPv4 2016-01-14 14:34:03 +01:00
Margaux Clerc
3f137b40fe Resize notification bubble 2016-01-13 09:32:16 +01:00
Margaux Clerc
626be7718f Change launch icons 2016-01-13 09:31:47 +01:00
Margaux Clerc
c54b6dbc9d Fix button delete/deselect_all in edit_bar layout 2016-01-12 10:07:51 +01:00
Margaux Clerc
2f73b26325 Fix chatroom selection 2016-01-12 10:07:50 +01:00
Margaux Clerc
003b21102b Rework topbar 2016-01-11 10:31:16 +01:00
Margaux Clerc
8f26fe7a23 Reworking assistant, add transport in login and fix error display 2016-01-11 10:31:16 +01:00
Simon Morlat
434840f8ec update linphone submodule to leave the choice of echo calibrator tones 2015-12-17 16:12:43 +01:00
Margaux Clerc
71926ccd16 Fix UI problems and linphone friend display name 2015-12-08 17:14:24 +01:00
Margaux Clerc
72328025d2 Fix merge 2015-12-08 17:13:12 +01:00
Margaux Clerc
e4c13e25cc Rename package name and logo 2015-12-08 17:09:33 +01:00
Margaux Clerc
96e27f63f3 Fix merge 2015-11-30 14:29:39 +01:00
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