From 750d76871d6e2ff64e7c53c09c688dd40777c5d3 Mon Sep 17 00:00:00 2001
From: Andrew Lee <anwlee@google.com>
Date: Mon, 13 Apr 2015 17:00:14 -0700
Subject: Remove extra VideoFragment in layouts.

This is for both the portrait and landscape layouts. This presumably
happened because of a bad merge.

Change-Id: I5e642bf42601661150312b78b900983885f2312c
---
 InCallUI/res/layout-land/call_card_fragment.xml | 12 +++---------
 InCallUI/res/layout/call_card_fragment.xml      |  8 +-------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/InCallUI/res/layout-land/call_card_fragment.xml b/InCallUI/res/layout-land/call_card_fragment.xml
index 7714178f5..cdee27970 100644
--- a/InCallUI/res/layout-land/call_card_fragment.xml
+++ b/InCallUI/res/layout-land/call_card_fragment.xml
@@ -68,14 +68,6 @@
         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"
-        android:visibility="gone" />
-
     <include layout="@layout/manage_conference_call_button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -86,7 +78,8 @@
         android:layout_gravity="start|center_vertical"
         android:id="@+id/videoCallFragment"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:visibility="gone" />
 
     <!-- Progress spinner, useful for indicating pending operations such as upgrade to video. -->
     <FrameLayout
@@ -106,6 +99,7 @@
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:indeterminate="true" />
+
     </FrameLayout>
 
     <!-- Placeholder for various fragments that are added dynamically underneath the caller info. -->
diff --git a/InCallUI/res/layout/call_card_fragment.xml b/InCallUI/res/layout/call_card_fragment.xml
index dc3ee118b..615744c79 100644
--- a/InCallUI/res/layout/call_card_fragment.xml
+++ b/InCallUI/res/layout/call_card_fragment.xml
@@ -72,13 +72,6 @@
         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"
@@ -97,6 +90,7 @@
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:indeterminate="true" />
+
     </FrameLayout>
 
     <!-- Secondary "Call info" block, for the background ("on hold") call. -->
-- 
cgit v1.2.3