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
|
45b365ecb1
|
Fix tests
|
2016-02-15 13:57:23 +01:00 |
|
Margaux Clerc
|
752381e71c
|
Fix edit in contacts list
|
2016-02-08 11:55:29 +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
|
003b21102b
|
Rework topbar
|
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
|
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
|
118e0f6b86
|
Fix toggle button
|
2015-11-24 12:07:56 +01:00 |
|
Margaux Clerc
|
a5c39de505
|
Fix contact with linphone friend
|
2015-11-09 14:33:47 +01:00 |
|
Margaux Clerc
|
ffb1eccb24
|
Interface update
|
2015-11-05 16:23:59 +01:00 |
|
Margaux Clerc
|
d724d20d3c
|
Update contact for linphoen friend
|
2015-11-03 18:43:05 +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 |
|