commit 7b10cf5e1c07c480cf31663ad75cec4854fb3c75
author Tyler Gunn <tgunn@google.com> Mon Apr 27 09:53:51 2015 -0700
committer Tyler Gunn <tgunn@google.com> Mon Apr 27 17:13:15 2015 +0000
tree a83815fadd5ec09813f6f13df058e9853bf6a19a
parent 19de08f89220b4dd5e31373f30278cacdb9a8e34

DO NOT MERGE Fix missing "manage conference" option.

- Corrected alignment of manage conference button.

Bug: 20476139
Change-Id: I31be2f460cc298f6b210931dd670ab7fbc19866e
(cherry picked from commit 0e52751f3b1434786a5ff943d8e7907d01a1137c)

InCallUI/res/layout/call_card_fragment.xml

diff --git a/InCallUI/res/layout/call_card_fragment.xml b/InCallUI/res/layout/call_card_fragment.xml
index 13f72d4..1971c9c 100644
--- a/InCallUI/res/layout/call_card_fragment.xml
+++ b/InCallUI/res/layout/call_card_fragment.xml
@@ -107,7 +107,7 @@
     <include layout="@layout/manage_conference_call_button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignTop="@id/photo" />
+        android:layout_below="@id/primary_call_info_container" />
 
     <fragment android:name="com.android.incallui.VideoCallFragment"
         android:layout_alignParentStart="true"