mirror of
https://gitlab.linphone.org/BC/public/linphone-android.git
synced 2026-01-18 11:58:09 +00:00
1b207c8dc1
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 |
||
|---|---|---|
| .. | ||
| about.xml | ||
| assistant.xml | ||
| assistant_account_creation.xml | ||
| assistant_account_creation_activation.xml | ||
| assistant_ec_calibration.xml | ||
| assistant_linphone_login.xml | ||
| assistant_login.xml | ||
| assistant_remote_provisioning.xml | ||
| assistant_remote_provisioning_login.xml | ||
| assistant_topbar.xml | ||
| assistant_welcome.xml | ||
| audio.xml | ||
| call.xml | ||
| call_inactive_row.xml | ||
| call_incoming.xml | ||
| call_outgoing.xml | ||
| chat.xml | ||
| chat_bubble_incoming.xml | ||
| chat_bubble_outgoing.xml | ||
| chatlist.xml | ||
| chatlist_cell.xml | ||
| conf_call_control_row.xml | ||
| conference_header.xml | ||
| conference_paused_row.xml | ||
| contact.xml | ||
| contact_cell.xml | ||
| contact_control_row.xml | ||
| contact_edit.xml | ||
| contact_edit_row.xml | ||
| contacts_list.xml | ||
| dialer.xml | ||
| dialog.xml | ||
| edit_list.xml | ||
| empty_fragment.xml | ||
| hello_world.xml | ||
| hidden.xml | ||
| history.xml | ||
| history_cell.xml | ||
| history_detail.xml | ||
| incall_stats.xml | ||
| input_dialog.xml | ||
| launch_screen.xml | ||
| main.xml | ||
| numpad.xml | ||
| preference_led.xml | ||
| preference_list_content.xml | ||
| remote_provisioning.xml | ||
| search_contact_cell.xml | ||
| settings.xml | ||
| side_menu_account_cell.xml | ||
| side_menu_item_cell.xml | ||
| side_menu_main_account.xml | ||
| status.xml | ||
| toast.xml | ||
| tutorials.xml | ||
| video.xml | ||