mirror of
https://gitlab.linphone.org/BC/public/linphone-android.git
synced 2026-01-19 12:38:07 +00:00
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
25 lines
776 B
XML
25 lines
776 B
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:tools="http://schemas.android.com/tools"
|
|
android:background="@color/colorG"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:orientation="vertical">
|
|
|
|
<fragment
|
|
android:id="@+id/status"
|
|
android:name="org.linphone.StatusFragment"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="35dp"
|
|
tools:layout="@layout/status" />
|
|
|
|
<include layout="@layout/assistant_topbar" android:id="@+id/topbar" />
|
|
|
|
<LinearLayout
|
|
android:id="@+id/fragmentContainer"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:padding="20dp"
|
|
android:orientation="horizontal" />
|
|
|
|
</LinearLayout>
|