diff options
author | Sai Cheemalapati <saicheems@google.com> | 2014-06-11 00:36:40 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-10 21:32:31 +0000 |
commit | d005675218627df53b4e83ac3c5345120b947b0c (patch) | |
tree | a58a021de7ba506d51e411286d10ce97f4cf3e26 /InCallUI | |
parent | f15391dab4e361963eafa41e213c24c1606e56c3 (diff) | |
parent | 9b26459b36cb60b11ab35f90a3303a2b793ea893 (diff) |
Merge "Match landscape on hold view to mockups."
Diffstat (limited to 'InCallUI')
-rw-r--r-- | InCallUI/res/layout-land/call_card_content.xml | 11 | ||||
-rw-r--r-- | InCallUI/res/layout/secondary_call_info.xml | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/InCallUI/res/layout-land/call_card_content.xml b/InCallUI/res/layout-land/call_card_content.xml index b084e4ae3..a03ab2dbb 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" diff --git a/InCallUI/res/layout/secondary_call_info.xml b/InCallUI/res/layout/secondary_call_info.xml index 8b39b0507..4d8711d81 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> |