diff options
| author | Tyler Gunn <tgunn@google.com> | 2015-04-27 17:29:48 +0000 |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2015-04-27 17:32:10 +0000 |
| commit | d97f5344fa8e57dd53943a279acfcb22fbfa7bd6 (patch) | |
| tree | 5ab6f1e9a73d3d785bde0f6ca00a971908d43f19 /InCallUI | |
| parent | 7c4d3f9c15b73ac5b89f62b438cdec4ff67b208c (diff) | |
| parent | 6815f2e4cbde48ba97dc8e67534109fb7f62283e (diff) | |
Merge "DO NOT MERGE Fix missing "manage conference" option." into m-wireless-dev
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/res/layout/call_card_fragment.xml | 2 |
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 |