summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/invideocall_panel.xml9
-rw-r--r--res/layout/primary_call_info.xml8
2 files changed, 8 insertions, 9 deletions
diff --git a/res/layout/invideocall_panel.xml b/res/layout/invideocall_panel.xml
index 12c72d57..0e48a994 100644
--- a/res/layout/invideocall_panel.xml
+++ b/res/layout/invideocall_panel.xml
@@ -30,7 +30,6 @@
-->
<com.android.incallui.VideoCallPanel xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/videoCallPanel"
- android:layout_below="@+id/primary_call_banner"
android:layout_alignParentBottom="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -40,15 +39,15 @@
<!-- Row 1: The camera preview and the video stream from far end. -->
<TextureView
android:id="@+id/video_view"
- android:layout_width="0dp"
- android:layout_height="0dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true" />
<TextureView
android:id="@+id/camera_view"
- android:layout_width="0dp"
- android:layout_height="0dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true" />
diff --git a/res/layout/primary_call_info.xml b/res/layout/primary_call_info.xml
index 58a30384..9a030a95 100644
--- a/res/layout/primary_call_info.xml
+++ b/res/layout/primary_call_info.xml
@@ -32,10 +32,6 @@
android:contentDescription="@string/contactPhoto"
android:src="@drawable/picture_unknown"/>
- <!-- Layout to replace the InCallContactPhoto with the video call panel
- for a VT call. By default this view is not visible -->
- <include layout="@layout/invideocall_panel" />
-
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -194,6 +190,10 @@
android:ellipsize="end"/>
</LinearLayout>
+ <!-- Layout to replace the InCallContactPhoto with the video call panel
+ for a VT call. By default this view is not visible -->
+ <include layout="@layout/invideocall_panel" />
+
</LinearLayout>