summaryrefslogtreecommitdiff
path: root/InCallUI
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2015-04-27 10:16:33 -0700
committerTyler Gunn <tgunn@google.com>2015-04-27 10:16:33 -0700
commit6815f2e4cbde48ba97dc8e67534109fb7f62283e (patch)
tree504f51bbacd3da8c55ef116fec4b3a4ae66c2ac0 /InCallUI
parent0af2982cc8235971113429941525de96b12bc9b8 (diff)
DO NOT MERGE Fix missing "manage conference" option.
- Corrected alignment of manage conference button. Bug: 20476139 Change-Id: I31be2f460cc298f6b210931dd670ab7fbc19866e
Diffstat (limited to 'InCallUI')
-rw-r--r--InCallUI/res/layout/call_card_fragment.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/InCallUI/res/layout/call_card_fragment.xml b/InCallUI/res/layout/call_card_fragment.xml
index 9f18906de..980003aa4 100644
--- a/InCallUI/res/layout/call_card_fragment.xml
+++ b/InCallUI/res/layout/call_card_fragment.xml
@@ -103,7 +103,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" />
<!-- Placeholder for the dialpad which is replaced with the dialpad fragment when shown. -->
<FrameLayout