diff options
| author | Tyler Gunn <tgunn@google.com> | 2015-05-05 21:06:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-05 21:06:36 +0000 |
| commit | f5129271b405c208f1358c12aa98af67eb61acad (patch) | |
| tree | c68ce07450365d5d235f1366754dd701cc9a9138 /InCallUI | |
| parent | 274db0ed33231014ad35726f07457d3fb45fc3d2 (diff) | |
| parent | ed8488149b8d842ee86b4c209d0f39d71f004146 (diff) | |
am cec8d5b8: DO NOT MERGE Fix merge issue.
* commit 'cec8d5b85f3822031114347bc24498bc0dda4dd9':
DO NOT MERGE Fix merge issue.
Diffstat (limited to 'InCallUI')
| -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" |