Merge "[DO NOT MERGE] Adjust multi-window UI for InCallUI <100% modes." into nyc-dev (eabfbca7) · Commits · e / os / android_packages_apps_Dialer

InCallUI/res/layout-h600dp/call_card_fragment.xml

0 → 100644

+173 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>

		<!--
		~ Copyright (C) 2016 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
		-->

		<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent">
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical">

		<!-- Primary "call card" block, for the foreground call. -->
		<LinearLayout
		android:id="@+id/primary_call_info_container"
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1"
		android:orientation="vertical"
		android:elevation="@dimen/primary_call_elevation"
		android:background="@color/incall_call_banner_background_color"
		android:paddingTop="@dimen/call_banner_primary_call_container_top_padding"
		android:clipChildren="false"
		android:clipToPadding="false"
		android:gravity="bottom">

		<include layout="@layout/primary_call_info"
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1"
		android:minHeight="@dimen/call_banner_height"
		android:animateLayoutChanges="true"
		android:gravity="center"
		android:layout_centerHorizontal="true" />

		<fragment android:name="com.android.incallui.CallButtonFragment"
		android:id="@+id/callButtonFragment"
		android:layout_width="match_parent"
		android:layout_height="wrap_content" />

		<TextView android:id="@+id/connectionServiceMessage"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:visibility="gone"
		android:padding="@dimen/call_banner_side_padding"
		android:background="@android:color/white" />

		</LinearLayout>

		<RelativeLayout
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="2">

		<FrameLayout
		android:layout_height="match_parent"
		android:layout_width="match_parent"
		android:id="@+id/call_card_content">

		<!-- Contact photo for primary call info -->
		<ImageView android:id="@+id/photoLarge"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:scaleType="centerCrop"
		android:importantForAccessibility="no"
		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>

		<fragment android:name="com.android.incallui.VideoCallFragment"
		android:id="@+id/videoCallFragment"
		android:layout_alignParentTop="true"
		android:layout_gravity="top\|center_horizontal"
		android:layout_width="match_parent"
		android:layout_height="match_parent" />

		<!-- Progress spinner, useful for indicating pending operations such as upgrade to video. -->
		<FrameLayout
		android:id="@+id/progressSpinner"
		android:background="#63000000"
		android:layout_width="fill_parent"
		android:layout_height="fill_parent"
		android:layout_centerHorizontal="true"
		android:layout_centerVertical="true"
		android:visibility="gone">

		<ProgressBar
		android:id="@+id/progress_bar"
		style="@android:style/Widget.Material.ProgressBar"
		android:layout_gravity="center"
		android:layout_width="48dp"
		android:layout_height="48dp"
		android:indeterminate="true" />

		</FrameLayout>


		<include layout="@layout/manage_conference_call_button"
		android:layout_width="match_parent"
		android:layout_height="wrap_content" />

		<!-- Placeholder for various fragments that are added dynamically underneath the caller info. -->
		<FrameLayout
		android:id="@+id/answer_and_dialpad_container"
		android:layout_gravity="bottom\|center_horizontal"
		android:layout_alignParentBottom="true"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:elevation="@dimen/dialpad_elevation" />

		<FrameLayout
		android:id="@+id/floating_end_call_action_button_container"
		android:layout_width="@dimen/end_call_floating_action_button_diameter"
		android:layout_height="@dimen/end_call_floating_action_button_diameter"
		android:background="@drawable/fab_red"
		android:layout_alignParentBottom="true"
		android:layout_centerHorizontal="true"
		android:layout_marginBottom="@dimen/end_call_button_margin_bottom">

		<ImageButton android:id="@+id/floating_end_call_action_button"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:background="@drawable/end_call_background"
		android:src="@drawable/fab_ic_end_call"
		android:scaleType="center"
		android:contentDescription="@string/onscreenEndCallText" />

		</FrameLayout>

		</RelativeLayout>

		</LinearLayout>
		<!-- Secondary "Call info" block, for the background ("on hold") call. -->
		<include layout="@layout/secondary_call_info" />
		</RelativeLayout>
		No newline at end of file

InCallUI/res/layout-land/call_card_fragment.xml→InCallUI/res/layout-w600dp-land/call_card_fragment.xml

+0 −0

File moved.

View file

InCallUI/res/layout/call_card_fragment.xml

+128 −138

Original line number	Diff line number	Diff line
		@@ -19,59 +19,80 @@
		<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent">
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical">

		<!-- Primary "call card" block, for the foreground call. -->
		<LinearLayout
		android:id="@+id/primary_call_info_container"
		android:layout_centerVertical="true"
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1"
		android:layout_height="match_parent"
		android:orientation="vertical"
		android:elevation="@dimen/primary_call_elevation"
		android:background="@color/incall_call_banner_background_color"
		android:paddingTop="@dimen/call_banner_primary_call_container_top_padding"
		android:clipChildren="false"
		android:clipToPadding="false"
		android:gravity="bottom">
		android:alpha="0.9">

		<include layout="@layout/primary_call_info"
		android:layout_centerHorizontal="true" />
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="@dimen/call_banner_vertical_margin"
		android:layout_marginBottom="@dimen/call_banner_vertical_margin"/>

		<fragment android:name="com.android.incallui.CallButtonFragment"
		android:id="@+id/callButtonFragment"
		android:layout_width="match_parent"
		android:layout_height="wrap_content" />
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal" />

		<TextView android:id="@+id/connectionServiceMessage"
		<!-- 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:textAppearance="?android:attr/textAppearanceMedium"
		android:visibility="gone"
		android:padding="@dimen/call_banner_side_padding"
		android:background="@android:color/white" />
		android:layout_gravity="bottom" />

		</LinearLayout>

		<RelativeLayout
		<!-- Placeholder for the dialpad which is replaced with the dialpad fragment when shown. -->
		<FrameLayout
		android:id="@+id/answer_and_dialpad_container"
		android:layout_width="match_parent"
		android:elevation="7dp"
		android:layout_height="match_parent" />

		<FrameLayout
		android:id="@+id/floating_end_call_action_button_container"
		android:layout_width="@dimen/end_call_floating_action_button_diameter"
		android:layout_height="@dimen/end_call_floating_action_button_diameter"
		android:background="@drawable/fab_red"
		android:layout_alignParentBottom="true"
		android:layout_centerHorizontal="true">

		<ImageButton android:id="@+id/floating_end_call_action_button"
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="2">
		android:layout_height="match_parent"
		android:background="@drawable/end_call_background"
		android:src="@drawable/fab_ic_end_call"
		android:scaleType="center"
		android:contentDescription="@string/onscreenEndCallText" />

		</FrameLayout>

		<FrameLayout
		android:layout_height="match_parent"
		android:layout_width="0dp"
		android:layout_weight="1"
		android:visibility="gone">

		<FrameLayout
		android:layout_height="match_parent"
		android:layout_width="match_parent"
		android:id="@+id/call_card_content">

		<!-- Contact photo for primary call info -->
		<ImageView android:id="@+id/photoLarge"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:scaleType="centerCrop"
		android:importantForAccessibility="no"
		android:contentDescription="@string/contactPhoto"
		android:background="@color/incall_photo_background_color"
		android:src="@drawable/img_no_image_automirrored" />

		@@ -85,7 +106,7 @@
		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:textColor="@color/glowpad_background_color"
		android:fontFamily="sans-serif-medium"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		@@ -99,19 +120,17 @@
		</LinearLayout>
		</FrameLayout>

		<fragment android:name="com.android.incallui.VideoCallFragment"
		android:id="@+id/videoCallFragment"
		android:layout_alignParentTop="true"
		android:layout_gravity="top\|center_horizontal"
		<include layout="@layout/manage_conference_call_button"
		android:layout_width="match_parent"
		android:layout_height="match_parent" />
		android:layout_height="wrap_content"
		android:layout_alignTop="@id/photoLarge" />

		<!-- Progress spinner, useful for indicating pending operations such as upgrade to video. -->
		<FrameLayout
		android:id="@+id/progressSpinner"
		android:background="#63000000"
		android:layout_width="fill_parent"
		android:layout_height="fill_parent"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_centerHorizontal="true"
		android:layout_centerVertical="true"
		android:visibility="gone" >
		@@ -126,42 +145,13 @@

		</FrameLayout>


		<include layout="@layout/manage_conference_call_button"
		android:layout_width="match_parent"
		android:layout_height="wrap_content" />

		<!-- Placeholder for various fragments that are added dynamically underneath the caller info. -->
		<FrameLayout
		android:id="@+id/answer_and_dialpad_container"
		android:layout_gravity="bottom\|center_horizontal"
		android:layout_alignParentBottom="true"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:elevation="@dimen/dialpad_elevation" />

		<FrameLayout
		android:id="@+id/floating_end_call_action_button_container"
		android:layout_width="@dimen/end_call_floating_action_button_diameter"
		android:layout_height="@dimen/end_call_floating_action_button_diameter"
		android:background="@drawable/fab_red"
		android:layout_alignParentBottom="true"
		android:layout_centerHorizontal="true"
		android:layout_marginBottom="@dimen/end_call_button_margin_bottom">

		<ImageButton android:id="@+id/floating_end_call_action_button"
		<fragment android:name="com.android.incallui.VideoCallFragment"
		android:layout_alignParentStart="true"
		android:layout_gravity="start\|center_vertical"
		android:id="@+id/videoCallFragment"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:background="@drawable/end_call_background"
		android:src="@drawable/fab_ic_end_call"
		android:scaleType="center"
		android:contentDescription="@string/onscreenEndCallText" />
		android:layout_height="match_parent" />

		</FrameLayout>

		</RelativeLayout>

		</LinearLayout>
		<!-- Secondary "Call info" block, for the background ("on hold") call. -->
		<include layout="@layout/secondary_call_info" />
		</RelativeLayout>
		No newline at end of file

InCallUI/res/layout/primary_call_info.xml

+161 −172

Original line number	Diff line number	Diff line
		@@ -21,22 +21,12 @@
		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:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1"
		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_width="match_parent"
		android:layout_height="match_parent"
		android:layout_weight="1"
		android:orientation="vertical"
		android:paddingStart="@dimen/call_banner_side_padding"
		android:paddingEnd="@dimen/call_banner_side_padding"
		android:clipChildren="false"
		android:clipToPadding="false"
		android:gravity="center">
		@@ -228,5 +218,4 @@
		android:ellipsize="end"
		android:visibility="gone" />

		</LinearLayout>
		</LinearLayout> <!-- End of call_banner -->

InCallUI/res/values-h600dp/dimens.xml

0 → 100644

+24 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright (C) 2016 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
		-->

		<resources>
		<dimen name="call_banner_height">90dp</dimen>

		<dimen name="end_call_button_margin_bottom">15dp</dimen>

		<dimen name="floating_action_button_vertical_offset">-24dp</dimen>
		</resources>