commit d005675218627df53b4e83ac3c5345120b947b0c
author Sai Cheemalapati <saicheems@google.com> Wed Jun 11 00:36:40 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 10 21:32:31 2014 +0000
tree a58a021de7ba506d51e411286d10ce97f4cf3e26
parent f15391dab4e361963eafa41e213c24c1606e56c3
parent 9b26459b36cb60b11ab35f90a3303a2b793ea893

Merge "Match landscape on hold view to mockups."

InCallUI/res/layout-land/call_card_content.xml

diff --git a/InCallUI/res/layout-land/call_card_content.xml b/InCallUI/res/layout-land/call_card_content.xml
index b084e4a..a03ab2d 100644
--- a/InCallUI/res/layout-land/call_card_content.xml
+++ b/InCallUI/res/layout-land/call_card_content.xml
@@ -40,6 +40,15 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" >
+            <!-- Secondary "Call info" block, for the background ("on hold") call. -->
+            <include layout="@layout/secondary_call_info"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom" />
+        </FrameLayout>
     </LinearLayout>
 
     <FrameLayout
@@ -56,8 +65,6 @@
             android:contentDescription="@string/contactPhoto"
             android:src="@drawable/picture_unknown" />
 
-        <!-- Secondary "Call info" block, for the background ("on hold") call. -->
-        <include layout="@layout/secondary_call_info" />
 
         <fragment android:name="com.android.incallui.DialpadFragment"
             android:id="@+id/dialpadFragment"

InCallUI/res/layout/secondary_call_info.xml

diff --git a/InCallUI/res/layout/secondary_call_info.xml b/InCallUI/res/layout/secondary_call_info.xml
index 8b39b05..4d8711d 100644
--- a/InCallUI/res/layout/secondary_call_info.xml
+++ b/InCallUI/res/layout/secondary_call_info.xml
@@ -49,4 +49,4 @@
         android:textAlignment="textEnd"
         android:singleLine="true" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>