Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab631e8a authored by Yorke Lee's avatar Yorke Lee Committed by Android (Google) Code Review
Browse files

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

parents e2cc0b2a eaa08c05
Loading
Loading
Loading
Loading
+25 −2
Original line number Diff line number Diff line
@@ -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