Merge "New layout for business call context." into ub-contactsdialer-a-dev (3867a0ac) · Commits · e / os / android_packages_apps_Dialer

InCallUI/res/layout/business_contact_context_list_header.xml

0 → 100644

+40 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2015 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:paddingEnd="@dimen/business_contact_context_end_padding">
		<ImageView android:id="@+id/icon"
		android:layout_width="@dimen/contact_context_title_image_size"
		android:layout_height="@dimen/contact_context_title_image_size"
		android:layout_marginLeft="@dimen/contact_context_title_image_side_padding"
		android:layout_marginRight="@dimen/contact_context_title_image_side_padding"
		android:layout_gravity="center"
		android:scaleType="center"
		android:src="@drawable/ic_business_white_24dp"
		android:tint="@color/business_contact_context_text_color"
		android:alpha="0.8"
		android:importantForAccessibility="no"/>
		<TextView android:id="@+id/title"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical"
		android:text="@string/business_contact_context_title"
		android:textSize="@dimen/business_contact_context_detail_font_size"
		android:textColor="@color/business_contact_context_text_color"
		android:fontFamily="sans-serif-medium"/>
		</LinearLayout>
		No newline at end of file

InCallUI/res/layout/business_context_info_list_item.xml

+23 −19

Original line number	Diff line number	Diff line
		@@ -13,32 +13,36 @@
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:paddingEnd="@dimen/business_contact_context_end_padding">
		<ImageView android:id="@+id/icon"
		android:layout_width="@dimen/business_contact_context_image_size"
		android:layout_height="@dimen/business_contact_context_image_size"
		android:layout_marginLeft="@dimen/business_contact_context_image_padding"
		android:layout_marginRight="@dimen/business_contact_context_image_padding"
		android:layout_gravity="center"
		android:scaleType="centerCrop"
		android:tint="@color/business_contact_context_text_color"
		android:alpha="0.8"
		android:layout_centerVertical="true"
		android:layout_marginLeft="@dimen/business_contact_context_image_padding"
		android:layout_marginRight="@dimen/business_contact_context_image_padding"/>
		android:alpha="0.8"/>
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:orientation="vertical">
		<TextView android:id="@+id/heading"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_toEndOf="@id/icon"
		android:textSize="@dimen/business_contact_context_heading_font_size"
		android:textColor="@color/business_contact_context_text_color"
		android:fontFamily="sans-serif-medium"/>
		<TextView android:id="@+id/detail"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_toEndOf="@id/icon"
		android:layout_below="@id/heading"
		android:textSize="@dimen/business_contact_context_detail_font_size"
		android:textColor="@color/business_contact_context_text_color"
		android:fontFamily="sans-serif-medium"/>
		</RelativeLayout>
		No newline at end of file
		</LinearLayout>
		</LinearLayout>
		No newline at end of file

InCallUI/res/layout/call_card_fragment.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@
		android:id="@+id/call_card_content">

		<!-- Contact photo for primary call info -->
		<ImageView android:id="@+id/photo"
		<ImageView android:id="@+id/photoLarge"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:scaleType="centerCrop"

InCallUI/res/layout/primary_call_info.xml

+21 −4

Original line number	Diff line number	Diff line
		@@ -21,17 +21,24 @@
		other status info. This info is shown as a "banner" overlaid across the top of contact photo.
		-->
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/primary_call_banner"
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1"
		android:orientation="vertical"
		android:orientation="horizontal"
		android:minHeight="@dimen/call_banner_height"
		android:paddingStart="@dimen/call_banner_side_padding"
		android:paddingEnd="@dimen/call_banner_side_padding"
		android:animateLayoutChanges="true"
		android:gravity="center">

		<LinearLayout
		android:id="@+id/primary_call_banner"
		android:layout_width="0dp"
		android:layout_height="match_parent"
		android:layout_weight="1"
		android:orientation="vertical"
		android:clipChildren="false"
		android:clipToPadding="false"
		android:animateLayoutChanges="true"
		android:gravity="center">

		<LinearLayout android:id="@+id/callSubjectLayout"
		@@ -196,4 +203,14 @@
		android:ellipsize="end"
		android:visibility="gone" />

		</LinearLayout>

		<!-- Contact photo for primary call info -->
		<ImageView android:id="@+id/photoSmall"
		android:layout_width="@dimen/contact_context_small_photo_size"
		android:layout_height="@dimen/contact_context_small_photo_size"
		android:layout_marginLeft="@dimen/call_banner_side_padding"
		android:scaleType="centerCrop"
		android:importantForAccessibility="no"
		android:src="@drawable/img_no_image_automirrored" />
		</LinearLayout> <!-- End of call_banner -->

InCallUI/res/values/dimens.xml

+6 −2

Original line number	Diff line number	Diff line
		@@ -121,6 +121,8 @@
		<dimen name="conference_call_manager_button_dimension">46dp</dimen>

		<dimen name="contact_context_title_text_size">14sp</dimen>
		<dimen name="contact_context_title_image_size">19dp</dimen>
		<dimen name="contact_context_title_image_side_padding">23dp</dimen>
		<dimen name="contact_context_title_margin_bottom">13dp</dimen>
		<dimen name="contact_context_list_item_padding">13dp</dimen>

		@@ -136,6 +138,8 @@
		<dimen name="business_contact_context_end_padding">10dp</dimen>
		<dimen name="business_contact_context_image_size">25dp</dimen>
		<dimen name="business_contact_context_image_padding">20dp</dimen>
		<dimen name="business_contact_context_heading_font_size">18sp</dimen>
		<dimen name="business_contact_context_detail_font_size">13sp</dimen>
		<dimen name="business_contact_context_heading_font_size">16sp</dimen>
		<dimen name="business_contact_context_detail_font_size">12sp</dimen>

		<dimen name="contact_context_small_photo_size">80dp</dimen>
		</resources>