diff options
| author | Tyler Gunn <tgunn@google.com> | 2015-05-05 13:57:18 -0700 |
|---|---|---|
| committer | Tyler Gunn <tgunn@google.com> | 2015-05-05 13:57:18 -0700 |
| commit | ed8488149b8d842ee86b4c209d0f39d71f004146 (patch) | |
| tree | d070d000fc836d00d8dcc8179867715776cc94ed | |
| parent | b040158d7bb2f5c7d06bd2c1db5e96adafbcff3e (diff) | |
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
| -rw-r--r-- | InCallUI/res/layout/call_card_fragment.xml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/InCallUI/res/layout/call_card_fragment.xml b/InCallUI/res/layout/call_card_fragment.xml index a21ed20d8..537eb5119 100644 --- a/InCallUI/res/layout/call_card_fragment.xml +++ b/InCallUI/res/layout/call_card_fragment.xml @@ -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" |