Brieuc Viel
|
71b9fc18e9
|
conflict merged and errors fixed
|
2016-04-13 16:47:31 +02:00 |
|
Brieuc Viel
|
105368e3c1
|
UI xml back up
|
2016-04-12 14:38:36 +02:00 |
|
Brieuc Viel
|
79cac9f3cd
|
Merge remote-tracking branch 'public/master' into obiane
|
2016-04-11 16:25:40 +02:00 |
|
Margaux Clerc
|
d7f3f03151
|
Update content description for accessibility
|
2016-03-23 11:59:52 +01:00 |
|
Margaux Clerc
|
d9fe5be063
|
Fix video call button
|
2016-03-02 17:53:34 +01:00 |
|
Margaux Clerc
|
917b5eb329
|
Fix call button size
|
2016-03-02 17:34:24 +01:00 |
|
Margaux Clerc
|
d95bf87378
|
Rework disabled images and call activity button
|
2016-02-26 09:29:59 +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
|
e10a0d0ab0
|
Fix conference pause, keyboard show/hide in assistant and some UI tests
|
2016-02-15 17:30:24 +01:00 |
|
Margaux Clerc
|
b50f326a62
|
Fix icons size
|
2016-02-09 11:36:02 +01:00 |
|
Margaux Clerc
|
cc069789b9
|
Fix video resized in full screen
|
2016-01-20 17:40:09 +01:00 |
|
Margaux Clerc
|
003b21102b
|
Rework topbar
|
2016-01-11 10:31:16 +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
|
fc96a26de9
|
Fix landscape graphics
|
2015-11-26 10:43:28 +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
|
b6722d7a65
|
Add chat in call and fix call problems
|
2015-11-09 14:31:40 +01:00 |
|
Margaux Clerc
|
f3fe215bc0
|
Update call view
|
2015-11-06 17:37:45 +01:00 |
|
Margaux Clerc
|
ffb1eccb24
|
Interface update
|
2015-11-05 16:23:59 +01:00 |
|
Margaux Clerc
|
3aae0ef4c3
|
Rework incall view
|
2015-10-26 19:48:37 +01:00 |
|
Margaux Clerc
|
fa0f35f4e0
|
fix numpad and incoming/outgoing view
|
2015-10-15 18:52:14 +02:00 |
|