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
|
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
|
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 |
|
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
|
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 |
|
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 |
|
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
|
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
|
2207df26da
|
Fix size of notifcation and status menu
|
2016-01-14 14:58:08 +01:00 |
|
Margaux Clerc
|
3f137b40fe
|
Resize notification bubble
|
2016-01-13 09:32:16 +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 |
|
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
|
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 |
|
Margaux Clerc
|
14c1609d95
|
Update views
|
2015-11-26 15:17:59 +01:00 |
|
Margaux Clerc
|
4dc2d80ebf
|
Use same style for empy chatlist/contactlist/history
|
2015-11-26 14:28:04 +01:00 |
|
Margaux Clerc
|
bb217a3a6e
|
Fix crash in chat
|
2015-11-26 10:43:28 +01:00 |
|
Margaux Clerc
|
fc96a26de9
|
Fix landscape graphics
|
2015-11-26 10:43:28 +01:00 |
|
Margaux Clerc
|
727033b77a
|
Rename asset
|
2015-11-26 10:43:28 +01:00 |
|
Margaux Clerc
|
bfcb406f84
|
Scroll on contact view
|
2015-11-20 17:09:52 +01:00 |
|
Margaux Clerc
|
a836e839b3
|
Update the chat view
|
2015-11-20 16:51:50 +01:00 |
|
Margaux Clerc
|
b32ad9ab61
|
Add mask for incoming cat bubble
|
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
|
18c2eef5b8
|
Improve chat view and new conversation
|
2015-11-13 15:09:45 +01:00 |
|
Margaux Clerc
|
a106c51f0d
|
Fix assistant and test
|
2015-11-13 11:07:06 +01:00 |
|
Margaux Clerc
|
884154ea40
|
Conference paused is now working
|
2015-11-10 17:58:59 +01:00 |
|
Margaux Clerc
|
0da770e015
|
Add chat edition for deleting chat message
fix new conversation
|
2015-11-10 17:57:26 +01:00 |
|
Margaux Clerc
|
c86bf1e990
|
Fix chat in call and in call view
|
2015-11-09 14:46:22 +01:00 |
|
Margaux Clerc
|
a5c39de505
|
Fix contact with linphone friend
|
2015-11-09 14:33:47 +01:00 |
|
Margaux Clerc
|
b6722d7a65
|
Add chat in call and fix call problems
|
2015-11-09 14:31:40 +01:00 |
|