summaryrefslogtreecommitdiff
path: root/InCallUI/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'InCallUI/res/layout')
-rw-r--r--InCallUI/res/layout/call_button_fragment.xml7
-rw-r--r--InCallUI/res/layout/call_card_content.xml7
-rw-r--r--InCallUI/res/layout/video_call_views.xml4
3 files changed, 16 insertions, 2 deletions
diff --git a/InCallUI/res/layout/call_button_fragment.xml b/InCallUI/res/layout/call_button_fragment.xml
index e8feca68a..69d0ee3a0 100644
--- a/InCallUI/res/layout/call_button_fragment.xml
+++ b/InCallUI/res/layout/call_button_fragment.xml
@@ -160,6 +160,13 @@
android:contentDescription="@string/onscreenOverflowText"
android:visibility="gone" />
+ <!-- "Manage conference button (Video Call) " -->
+ <ImageButton android:id="@+id/manageVideoCallConferenceButton"
+ style="@style/InCallButton"
+ android:background="@drawable/ic_group_white_24dp"
+ android:contentDescription="@string/onscreenManageConferenceText"
+ android:visibility="gone" />
+
</LinearLayout>
</LinearLayout>
diff --git a/InCallUI/res/layout/call_card_content.xml b/InCallUI/res/layout/call_card_content.xml
index 7a42586ea..a5fd8f72a 100644
--- a/InCallUI/res/layout/call_card_content.xml
+++ b/InCallUI/res/layout/call_card_content.xml
@@ -70,6 +70,13 @@
android:background="@android:color/white"
android:src="@drawable/img_no_image_automirrored" />
+ <fragment android:name="com.android.incallui.VideoCallFragment"
+ android:id="@+id/videoCallFragment"
+ android:layout_alignParentTop="true"
+ android:layout_gravity="top|center_horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+
<!-- Progress spinner, useful for indicating pending operations such as upgrade to video. -->
<FrameLayout
android:id="@+id/progressSpinner"
diff --git a/InCallUI/res/layout/video_call_views.xml b/InCallUI/res/layout/video_call_views.xml
index ab03aa358..8961ea4bf 100644
--- a/InCallUI/res/layout/video_call_views.xml
+++ b/InCallUI/res/layout/video_call_views.xml
@@ -22,7 +22,7 @@
<TextureView
android:id="@+id/incomingVideo"
- android:layout_gravity="center_vertical"
+ android:layout_gravity="center"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<!-- The width and height are replaced at runtime based on the selected camera. -->
@@ -32,4 +32,4 @@
android:layout_margin="@dimen/video_preview_margin"
android:layout_width="70dp"
android:layout_height="120dp" />
-</FrameLayout> \ No newline at end of file
+</FrameLayout>