mirror of
https://gitlab.linphone.org/BC/public/linphone-android.git
synced 2026-01-18 03:48:08 +00:00
c3dc710337
Conflicts: AndroidManifest.xml res/layout/chat_bubble_alt_incoming.xml res/layout/chat_bubble_alt_outgoing.xml res/layout/chat_bubble_incoming.xml res/layout/chat_bubble_outgoing.xml res/values/strings.xml src/org/linphone/ContactsManager.java src/org/linphone/compatibility/ApiFivePlus.java src/org/linphone/ui/BubbleChat.java
18 lines
No EOL
512 B
XML
18 lines
No EOL
512 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:id="@+id/fragmentContainer"
|
|
android:orientation="vertical"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent">
|
|
|
|
<fragment
|
|
android:id="@+id/status"
|
|
android:name="org.linphone.StatusFragment"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="40dp"
|
|
tools:layout="@layout/status" />
|
|
|
|
|
|
|
|
</LinearLayout> |