summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-11-09 09:49:51 -0800
committerYorke Lee <yorkelee@google.com>2015-11-09 09:49:51 -0800
commiteaa08c05e1a6bfb4b6f1ba32277ddbc190d46fb3 (patch)
treee6f7794f6fc595330fa73bad45faa38bca3a7c98
parent2155a2f4fdc8d977ac1c33f7223b1ba4b55aee9e (diff)
Fix InCallUI NPE in landscape mode
Some caller context related views were missing their counterparts in the landscape version of call_card_fragment. Bug: 25562815 Change-Id: I49f64a9037e96b7b507f93d79728551b83245490
-rw-r--r--InCallUI/res/layout-land/call_card_fragment.xml27
1 files changed, 25 insertions, 2 deletions
diff --git a/InCallUI/res/layout-land/call_card_fragment.xml b/InCallUI/res/layout-land/call_card_fragment.xml
index b0a534ee9..c71cf07a6 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