Commit graph

340 commits

Author SHA1 Message Date
Brieuc Viel
ab761d1a1d [Presence] update in progress 2016-04-19 15:45:47 +02:00
Brieuc Viel
fd86b9735c [Presence] chat message fixed - display is back 2016-04-18 16:59:01 +02:00
Brieuc Viel
42d3bd51f6 [Presence] AvatarPresenceImage implemented into Contact, History and chat 2016-04-18 16:18:29 +02:00
Brieuc Viel
8f930b173d [presence] listener added and genereic clac avatarWithPresence 2016-04-15 15:36:08 +02:00
Brieuc Viel
2bfd16330e [presence] merge bugs fixed + presenece in progress 2016-04-14 16:56:14 +02:00
Brieuc Viel
71b9fc18e9 conflict merged and errors fixed 2016-04-13 16:47:31 +02:00
Brieuc Viel
79cac9f3cd Merge remote-tracking branch 'public/master' into obiane 2016-04-11 16:25:40 +02:00
Sylvain Berfini
4193cefa60 Do not refresh contacts when not required 2016-03-23 12:00:24 +01:00
Sylvain Berfini
8d65fab06c Fixed contact lookup for history & chat 2016-03-23 12:00:24 +01:00
Sylvain Berfini
a75da820ed Started rework of contacts 2016-03-23 12:00:24 +01:00
Margaux Clerc
69b1eb2f74 Add android permission support for sdk 23 2016-03-23 11:59:52 +01:00
Margaux Clerc
55311ac4c6 Fix crash with android permission for Contacts and Echo canceller in the assistant 2016-03-23 11:59:52 +01:00
Margaux Clerc
d292f73585 Fix contact list in tablet version
Disable old animations
2016-03-23 11:59:52 +01:00
Margaux Clerc
4b251b6cfd Fix tablet problem with fragments and add dispaly name in history 2016-03-23 11:59:52 +01:00
Margaux Clerc
5152a7673d Fix cancel in About page (after a rotation) 2016-03-02 11:39:01 +01:00
Margaux Clerc
0302654fbd Fix outgoincall resuming and proximity sensor 2016-02-26 15:56:33 +01:00
Margaux Clerc
3dfe287520 Launch wizard if no account configured 2016-02-24 15:15:22 +01:00
Margaux Clerc
21c03ae5fe Update number version and add https migration 2016-02-22 17:40:17 +01:00
Margaux Clerc
bc57fde9c9 Fix empty fragment for tablet version 2016-02-22 14:20:04 +01:00
Margaux Clerc
179546dacd Interface update and bug fixes 2016-02-22 11:16:39 +01:00
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
f68df2c584 Tablet: Fix new chat conversation and display first listview element 2016-02-17 15:19:26 +01:00
Margaux Clerc
cb14535ab7 Rework About fragment 2016-02-11 16:44:50 +01:00
Margaux Clerc
2ea62bb0c9 Fix fragment back button and add cancel button for contact editor 2016-02-10 14:27:14 +01:00
Sylvain Berfini
644430db5c Removed static import 2016-02-05 17:22:04 +01:00
Sylvain Berfini
587a2bff50 Fix transfer 2016-01-22 10:15:06 +01:00
Margaux Clerc
0b867f947f Fix call errors and add portrait support for tablet 2016-01-21 17:08:01 +01:00
Margaux Clerc
be8dc562ec Fix error display 2016-01-19 11:27:36 +01:00
Margaux Clerc
72328025d2 Fix merge 2015-12-08 17:13:12 +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
Margaux Clerc
41d998beb9 Clean settings and add orientation preference 2015-11-19 15:08:50 +01:00
Margaux Clerc
d943c41fe5 Fix back in settings 2015-11-17 17:27:10 +01:00
Margaux Clerc
417b7d0a6a Back to dialer in settings and about 2015-11-17 17:27:09 +01:00
Margaux Clerc
f2f12e1bdb Rename assets 2015-11-17 17:27:09 +01:00
Margaux Clerc
756a183436 Add topbar in settings and about menu
add option for portrait orientation only
2015-11-17 10:24:16 +01:00
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
Margaux Clerc
3aa9f829c9 Fix account delete in side menu and status bar 2015-11-13 16:47:48 +01:00
Margaux Clerc
d279336e33 fix small issues 2015-11-10 17:53:12 +01:00
Margaux Clerc
b6722d7a65 Add chat in call and fix call problems 2015-11-09 14:31:40 +01:00
Margaux Clerc
c3072beae1 Merge remote-tracking branch 'private/3.0.X' into obiane
Conflicts:
	src/org/linphone/CallActivity.java
2015-11-09 14:16:42 +01:00
Margaux Clerc
ffb1eccb24 Interface update 2015-11-05 16:23:59 +01:00
Margaux Clerc
92c066d239 Add chat in call 2015-11-05 15:40:47 +01:00
Margaux Clerc
0ad181c1c3 Rename fragment 2015-10-26 19:43:34 +01:00
Margaux Clerc
dde619359b Add delte contact in contact list 2015-10-26 19:35:22 +01:00
Margaux Clerc
24af401775 Rework and rename incoming call and outgoing call activity 2015-10-15 17:56:27 +02:00
Margaux Clerc
23e66f1c70 Refresh accounts works and remove about/assistant from settings 2015-10-15 16:31:39 +02:00
Margaux Clerc
237487cb58 Add topbar and hide tabbar in about 2015-10-15 15:05:53 +02:00
Margaux Clerc
b7869d703e Update main view 2015-09-18 18:32:25 +02:00
Margaux Clerc
18d5706572 Update Linphone Main with side menu/ Dialer 2015-09-18 18:08:44 +02:00