commit fc8cdf698580d0b7507094c55869826ff9b878f1
author Yorke Lee <yorkelee@google.com> Tue Nov 10 01:41:51 2015 +0000
committer android-build-merger <android-build-merger@google.com> Tue Nov 10 01:41:51 2015 +0000
tree 0383fc11bd87d00e2bc8a0e073335a70f5ad0078
parent c54b486e9099af00047688c42c2358471a753128
parent ab631e8a62021a1c188d301fa77f70cbae07ded6

Merge "Fix InCallUI NPE in landscape mode" into ub-contactsdialer-a-dev
am: ac986088a4

* commit 'ac986088a4f37ea875e7d294483736a0eae6e5c8':
  Fix InCallUI NPE in landscape mode

InCallUI/res/layout-land/call_card_fragment.xml

diff --git a/InCallUI/res/layout-land/call_card_fragment.xml b/InCallUI/res/layout-land/call_card_fragment.xml
index b0a534e..c71cf07 100644
--- a/InCallUI/res/layout-land/call_card_fragment.xml
+++ b/InCallUI/res/layout-land/call_card_fragment.xml
@@ -63,7 +63,7 @@
             android:layout_width="match_parent"
             android:id="@+id/call_card_content">
 
-            <ImageView android:id="@+id/photo"
+            <ImageView android:id="@+id/photoLarge"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:scaleType="centerCrop"
@@ -71,12 +71,35 @@
                 android:background="@color/incall_photo_background_color"
                 android:src="@drawable/img_no_image_automirrored" />
 
+            <!-- Call context -->
+            <LinearLayout
+                android:id="@+id/contact_context"
+                android:layout_height="match_parent"
+                android:layout_width="match_parent"
+                android:orientation="vertical"
+                android:background="@color/incall_background_color"
+                android:visibility="gone">
+                <TextView android:id="@+id/contactContextTitle"
+                    android:textSize="@dimen/contact_context_title_text_size"
+                    android:textColor="@color/contact_context_title_text_color"
+                    android:fontFamily="sans-serif-medium"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginBottom="@dimen/contact_context_title_margin_bottom" />
+                <ListView android:id="@+id/contactContextInfo"
+                     android:layout_width="match_parent"
+                     android:layout_height="match_parent"
+                     android:divider="@null"
+                     android:dividerHeight="@dimen/contact_context_list_item_padding" />
+            </LinearLayout>
+
         </FrameLayout>
 
         <include layout="@layout/manage_conference_call_button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignTop="@id/photo" />
+            android:layout_alignTop="@id/photoLarge" />
 
         <!-- Progress spinner, useful for indicating pending operations such as upgrade to video. -->
         <FrameLayout