Merge "Dialer: Fix the emergence call failure in airplane mode" into atel.lnx.2.0-dev
diff --git a/InCallUI/res/layout-w500dp-land/call_card_fragment.xml b/InCallUI/res/layout-w500dp-land/call_card_fragment.xml
index 049f41f..597bf4f 100644
--- a/InCallUI/res/layout-w500dp-land/call_card_fragment.xml
+++ b/InCallUI/res/layout-w500dp-land/call_card_fragment.xml
@@ -120,6 +120,7 @@
</RelativeLayout>
<LinearLayout
+ android:id="@+id/manage_conference_call"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
@@ -130,16 +131,18 @@
android:layout_height="wrap_content"
android:elevation="5dp"
android:layout_alignParentBottom="true"/>
-
- <!-- Volume boost and Volume enhancements in-call UI -->
- <ImageButton android:id="@+id/volumeBoost"
- android:layout_width="80dp"
- android:layout_height="80dp"
- android:visibility="gone"
- android:soundEffectsEnabled="false"
- android:background="@drawable/vb_normal"/>
</LinearLayout>
+ <!-- Volume boost and Volume enhancements in-call UI -->
+ <ImageButton android:id="@+id/volumeBoost"
+ android:layout_width="80dp"
+ android:layout_height="80dp"
+ android:layout_toEndOf="@id/primary_call_info_container"
+ android:layout_below="@id/manage_conference_call"
+ android:visibility="gone"
+ android:soundEffectsEnabled="false"
+ android:background="@drawable/vb_normal"/>
+
<!-- Secondary "Call info" block, for the background ("on hold") call. -->
<include layout="@layout/secondary_call_info"
android:id="@+id/secondary_call_info"