Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed848814 authored by Tyler Gunn's avatar Tyler Gunn
Browse files

DO NOT MERGE Fix merge issue. 

When I cherry picked in cl/685115, it looks like my moving of the
VideoCallFragment didn't merge properly.  Removing extra instance.

Bug: 20257400
Change-Id: I0194a96c1f65bda10368ebccd21165c8f2c3c217
parent b040158d

InCallUI/res/layout/call_card_fragment.xml

+0 −8
Original line number Diff line number Diff line
@@ -116,14 +116,6 @@ 
        android:layout_height="wrap_content"

        android:layout_below="@id/primary_call_info_container" />



    <fragment android:name="com.android.incallui.VideoCallFragment"

        android:layout_alignParentStart="true"

        android:layout_gravity="start|center_vertical"

        android:id="@+id/videoCallFragment"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:visibility="gone" />



    <!-- Placeholder for various fragments that are added dynamically underneath the caller info. -->

    <FrameLayout

        android:id="@+id/answer_and_dialpad_container"