From ccca31529c07970e89419fb85a9e8153a5396838 Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Wed, 22 Feb 2017 16:32:36 -0800
Subject: Update dialer sources.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Test: Built package and system image.

This change clobbers the old source, and is an export
from an internal Google repository.

The internal repository was forked form Android in March,
and this change includes modifications since then, to
near the v8 release.

Since the fork, we've moved code from monolithic to independent modules. In addition,
we've switched to Blaze/Bazel as the build sysetm. This export, however, still uses make.

New dependencies have been added:
- Dagger
- Auto-Value
- Glide
- Libshortcutbadger

Going forward, development will still be in Google3, and the Gerrit release
will become an automated export, with the next drop happening in ~ two weeks.

Android.mk includes local modifications from ToT.

Abridged changelog:

Bug fixes
● Not able to mute, add a call when using Phone app in multiwindow mode
● Double tap on keypad triggering multiple key and tones
● Reported spam numbers not showing as spam in the call log
● Crash when user tries to block number while Phone app is not set as default
● Crash when user picks a number from search auto-complete list

Visual Voicemail (VVM) improvements
● Share Voicemail audio via standard exporting mechanisms that support file attachment
(email, MMS, etc.)
● Make phone number, email and web sites in VVM transcript clickable
● Set PIN before declining VVM Terms of Service {Carrier}
● Set client type for outbound visual voicemail SMS {Carrier}

New incoming call and incall UI on older devices
(Android M)
● Updated Phone app icon
● New incall UI (large buttons, button labels)
● New and animated Answer/Reject gestures

Accessibility
● Add custom answer/decline call buttons on answer screen for touch exploration
accessibility services
● Increase size of touch target
● Add verbal feedback when a Voicemail fails to load
● Fix pressing of Phone buttons while in a phone call using Switch Access
● Fix selecting and opening contacts in talkback mode
● Split focus for ‘Learn More’ link in caller id & spam to help distinguish similar text

Other
● Backup & Restore for App Preferences
● Prompt user to enable Wi-Fi calling if the call ends due to out of service and Wi-Fi is
connected
● Rename “Dialpad” to “Keypad”
● Show "Private number" for restricted calls
● Delete unused items (vcard, add contact, call history) from Phone menu

Change-Id: I2a7e53532a24c21bf308bf0a6d178d7ddbca4958
---
 InCallUI/res/layout/accessible_answer_fragment.xml | 104 ----------
 InCallUI/res/layout/answer_fragment.xml            |  42 ----
 .../business_contact_context_list_header.xml       |  40 ----
 .../res/layout/business_context_info_list_item.xml |  48 -----
 InCallUI/res/layout/call_button_fragment.xml       | 171 ---------------
 InCallUI/res/layout/call_card_fragment.xml         | 158 --------------
 InCallUI/res/layout/caller_in_conference.xml       | 116 -----------
 .../res/layout/conference_manager_fragment.xml     |  36 ----
 InCallUI/res/layout/incall_dialpad_fragment.xml    |  24 ---
 InCallUI/res/layout/incall_screen.xml              |  23 --
 .../res/layout/manage_conference_call_button.xml   |  72 -------
 InCallUI/res/layout/outgoing_call_animation.xml    |  22 --
 .../res/layout/person_context_info_list_item.xml   |  40 ----
 InCallUI/res/layout/primary_call_info.xml          | 231 ---------------------
 InCallUI/res/layout/secondary_call_info.xml        | 105 ----------
 InCallUI/res/layout/video_call_fragment.xml        |  28 ---
 InCallUI/res/layout/video_call_views.xml           |  66 ------
 17 files changed, 1326 deletions(-)
 delete mode 100644 InCallUI/res/layout/accessible_answer_fragment.xml
 delete mode 100644 InCallUI/res/layout/answer_fragment.xml
 delete mode 100644 InCallUI/res/layout/business_contact_context_list_header.xml
 delete mode 100644 InCallUI/res/layout/business_context_info_list_item.xml
 delete mode 100644 InCallUI/res/layout/call_button_fragment.xml
 delete mode 100644 InCallUI/res/layout/call_card_fragment.xml
 delete mode 100644 InCallUI/res/layout/caller_in_conference.xml
 delete mode 100644 InCallUI/res/layout/conference_manager_fragment.xml
 delete mode 100644 InCallUI/res/layout/incall_dialpad_fragment.xml
 delete mode 100644 InCallUI/res/layout/incall_screen.xml
 delete mode 100644 InCallUI/res/layout/manage_conference_call_button.xml
 delete mode 100644 InCallUI/res/layout/outgoing_call_animation.xml
 delete mode 100644 InCallUI/res/layout/person_context_info_list_item.xml
 delete mode 100644 InCallUI/res/layout/primary_call_info.xml
 delete mode 100644 InCallUI/res/layout/secondary_call_info.xml
 delete mode 100644 InCallUI/res/layout/video_call_fragment.xml
 delete mode 100644 InCallUI/res/layout/video_call_views.xml

(limited to 'InCallUI/res/layout')

diff --git a/InCallUI/res/layout/accessible_answer_fragment.xml b/InCallUI/res/layout/accessible_answer_fragment.xml
deleted file mode 100644
index 90fe57788..000000000
--- a/InCallUI/res/layout/accessible_answer_fragment.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-~ Copyright (C) 2013 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"
-    android:gravity="center_horizontal"
-    android:background="@color/glowpad_background_color">
-    <RelativeLayout
-        android:id="@+id/accessible_answer_fragment_answer"
-        android:orientation="vertical"
-        android:layout_width="120dp"
-        android:layout_height="120dp"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:clickable="true"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp">
-        <ImageView
-            android:layout_width="64dp"
-            android:layout_height="64dp"
-            android:src="@drawable/ic_lockscreen_answer_activated_layer"
-            android:layout_centerInParent="true">
-        </ImageView>
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/description_target_answer"
-            android:textSize="12sp"
-            android:textColor="@color/accessible_answer_hint_text_color"
-            android:layout_alignParentBottom="true"
-            android:layout_centerHorizontal="true"
-            android:layout_marginBottom="8dp"/>
-    </RelativeLayout>
-    <RelativeLayout
-        android:id="@+id/accessible_answer_fragment_decline"
-        android:orientation="vertical"
-        android:layout_width="120dp"
-        android:layout_height="120dp"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:clickable="true"
-        android:layout_alignParentLeft="true"
-        android:layout_centerVertical="true"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp">
-        <ImageView
-            android:layout_width="64dp"
-            android:layout_height="64dp"
-            android:src="@drawable/ic_lockscreen_decline_activated_layer"
-            android:layout_centerInParent="true">
-        </ImageView>
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/description_target_decline"
-            android:textSize="12sp"
-            android:textColor="@color/accessible_answer_hint_text_color"
-            android:layout_alignParentBottom="true"
-            android:layout_centerHorizontal="true"
-            android:layout_marginBottom="8dp"/>
-    </RelativeLayout>
-    <LinearLayout
-        android:id="@+id/accessible_answer_fragment_text"
-        android:orientation="vertical"
-        android:layout_width="92dp"
-        android:layout_height="92dp"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:clickable="true"
-        android:layout_alignParentEnd="false"
-        android:layout_alignParentStart="false"
-        android:layout_above="@+id/accessible_answer_fragment_decline"
-        android:layout_alignWithParentIfMissing="false"
-        android:layout_alignParentTop="false"
-        android:layout_alignParentLeft="false"
-        android:layout_alignParentBottom="false"
-        android:layout_alignParentRight="false"
-        android:layout_centerHorizontal="true"
-        android:contentDescription="@string/description_target_send_sms"
-        android:gravity="center">
-        <ImageView
-            android:layout_width="64dp"
-            android:layout_height="64dp"
-            android:src="@drawable/ic_lockscreen_text">
-        </ImageView>
-    </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/InCallUI/res/layout/answer_fragment.xml b/InCallUI/res/layout/answer_fragment.xml
deleted file mode 100644
index ec6ef30ac..000000000
--- a/InCallUI/res/layout/answer_fragment.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2013 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
-  -->
-
-<com.android.incallui.GlowPadWrapper
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:dc="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/glow_pad_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:focusable="true"
-        android:layout_centerHorizontal="true"
-        android:gravity="center"
-        android:background="@color/glowpad_background_color"
-        android:layout_marginBottom="@dimen/glowpadview_margin_bottom"
-
-        dc:targetDrawables="@array/incoming_call_widget_audio_with_sms_targets"
-        dc:targetDescriptions="@array/incoming_call_widget_audio_with_sms_target_descriptions"
-        dc:directionDescriptions="@array/incoming_call_widget_audio_with_sms_direction_descriptions"
-        dc:handleDrawable="@drawable/ic_incall_audio_handle"
-        dc:outerRingDrawable="@drawable/ic_lockscreen_outerring"
-        dc:outerRadius="@dimen/glowpadview_target_placement_radius"
-        dc:innerRadius="@dimen/glowpadview_inner_radius"
-        dc:snapMargin="@dimen/glowpadview_snap_margin"
-        dc:feedbackCount="1"
-        dc:vibrationDuration="20"
-        dc:glowRadius="@dimen/glowpadview_glow_radius"
-        dc:pointDrawable="@drawable/ic_lockscreen_glowdot"
-        dc:allowScaling="true" />
diff --git a/InCallUI/res/layout/business_contact_context_list_header.xml b/InCallUI/res/layout/business_contact_context_list_header.xml
deleted file mode 100644
index 90521188e..000000000
--- a/InCallUI/res/layout/business_contact_context_list_header.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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
diff --git a/InCallUI/res/layout/business_context_info_list_item.xml b/InCallUI/res/layout/business_context_info_list_item.xml
deleted file mode 100644
index 616d219d9..000000000
--- a/InCallUI/res/layout/business_context_info_list_item.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?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/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"/>
-     <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: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:textSize="@dimen/business_contact_context_detail_font_size"
-             android:textColor="@color/business_contact_context_text_color"
-             android:fontFamily="sans-serif-medium"/>
-     </LinearLayout>
- </LinearLayout>
\ No newline at end of file
diff --git a/InCallUI/res/layout/call_button_fragment.xml b/InCallUI/res/layout/call_button_fragment.xml
deleted file mode 100644
index 802e3de62..000000000
--- a/InCallUI/res/layout/call_button_fragment.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2013 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
-  -->
-
-<!-- In-call onscreen touch UI elements, used on some platforms.
-
-     This layout is a fullscreen overlay, drawn on top of the
-     non-touch-sensitive parts of the in-call UI (i.e. the call card).
-
-     The top-level View here is a InCallTouchUi (FrameLayout) with 2 children:
-       (1) inCallControls: the widgets visible while a regular call (or calls) is in progress
-       (2) incomingCallWidget: the UI displayed while an incoming call is ringing
-     In usual cases, one of these is visible at any given moment.
-     One exception is when incomingCallWidget is fading-out. At that moment, we show
-     inCallControls beneath incomingCallWidget for smoother transition.
-     -->
-
-<!-- Main cluster of onscreen buttons on the lower part of the screen. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/bottomButtons"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_margin="0dp"
-    android:padding="0dp"
-    android:background="@color/button_background_color"
-    android:layout_height="wrap_content"
-    android:layout_alignParentBottom="true"
-    android:animateLayoutChanges="true" >
-
-    <LinearLayout
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="bottom|center_horizontal"
-        android:baselineAligned="false">
-
-        <!-- This row only ever shows either 4 or 5 buttons. This may depend on whether the device
-             supports "Hold" (i.e. 4 buttons on CDMA devices, 5 buttons on GSM devices.) or whether
-             it is in a video call.
-
-             There are a couple of *pairs* of buttons that share a single "slot", namely Hold/Swap
-             and Add/Merge.  For these, the code in InCallTouchUi is responsible for making sure
-             that at any point exactly one of the pair is VISIBLE and the other is GONE.
-
-             If there are more than 5 buttons eligible to be shown, the presenter is responsible for
-             collapsing those options into an overflow menu, which appears as one of the buttons
-             in the row instead. -->
-
-        <!-- FAR LEFT SLOT ===================================================================== -->
-
-        <!-- "Audio mode". this is a multi-mode button that can behave either like a simple
-             "compound button" with two states *or* like an action button that brings up a popup
-             menu; see btn_compound_audio.xml and CallButtonFragment.updateAudioButtons(). -->
-        <ToggleButton android:id="@+id/audioButton"
-            style="@style/InCallCompoundButton"
-            android:background="@drawable/btn_compound_audio"
-            android:contentDescription="@string/audio_mode_speaker" />
-
-        <!-- MIDDLE LEFT SLOT ================================================================== -->
-
-        <!-- "Mute" -->
-        <ToggleButton android:id="@+id/muteButton"
-            style="@style/InCallCompoundButton"
-            android:background="@drawable/btn_compound_mute"
-            android:contentDescription="@string/onscreenMuteText_unselected" />
-
-        <!-- CENTER SLOT ======================================================================= -->
-
-        <!-- "Dialpad" -->
-        <ToggleButton android:id="@+id/dialpadButton"
-            style="@style/InCallCompoundButton"
-            android:background="@drawable/btn_compound_dialpad"
-            android:contentDescription="@string/onscreenShowDialpadText_unselected" />
-
-        <!-- MIDDLE RIGHT SLOT ================================================================= -->
-
-        <!-- This slot is either "Hold" or "Swap", depending on the state of the call. One or the
-             other of these must always be set to GONE. -->
-
-        <!-- "Hold" -->
-        <ToggleButton android:id="@+id/holdButton"
-            style="@style/InCallCompoundButton"
-            android:background="@drawable/btn_compound_hold"
-            android:contentDescription="@string/onscreenHoldText_unselected" />
-
-        <!-- "Swap" (or "Manage calls" in some CDMA states) -->
-        <ImageButton android:id="@+id/swapButton"
-            style="@style/InCallButton"
-            android:background="@drawable/btn_swap"
-            android:contentDescription="@string/onscreenSwapCallsText"
-            android:visibility="gone" />
-
-        <!-- "Change to video call" -->
-        <ImageButton android:id="@+id/changeToVideoButton"
-            style="@style/InCallButton"
-            android:background="@drawable/btn_change_to_video"
-            android:contentDescription="@string/onscreenVideoCallText"
-            android:visibility="gone" />
-
-        <!-- "Switch camera" for video calls. -->
-        <ToggleButton android:id="@+id/switchCameraButton"
-            style="@style/InCallCompoundButton"
-            android:background="@drawable/btn_compound_video_switch"
-            android:contentDescription="@string/onscreenSwitchCameraText"
-            android:visibility="gone" />
-
-        <!-- FAR RIGHT SLOT ==================================================================== -->
-
-        <!-- This slot is either "Add" or "Merge", depending on the state of the call.  One or the
-             other of these must always be set to GONE. -->
-
-        <!-- "Turn off camera" for video calls. -->
-        <ToggleButton android:id="@+id/pauseVideoButton"
-            style="@style/InCallCompoundButton"
-            android:background="@drawable/btn_compound_video_off"
-            android:contentDescription="@string/onscreenTurnOffCameraText"
-            android:visibility="gone" />
-
-        <!-- "Change to audio call" for video calls. -->
-        <ImageButton android:id="@+id/changeToVoiceButton"
-                     style="@style/InCallButton"
-                     android:background="@drawable/btn_change_to_voice"
-                     android:contentDescription="@string/onscreenChangeToVoiceText"
-                     android:visibility="gone" />
-
-        <!-- "Add Call" -->
-        <ImageButton android:id="@+id/addButton"
-            style="@style/InCallButton"
-            android:background="@drawable/btn_add"
-            android:contentDescription="@string/onscreenAddCallText"
-            android:visibility="gone" />
-
-        <!-- "Merge calls". This button is used only on GSM devices, where we know that "Add" and
-             "Merge" are never available at the same time. The "Merge" button for CDMA devices is
-             "cdmaMergeButton" above. -->
-        <ImageButton android:id="@+id/mergeButton"
-            style="@style/InCallButton"
-            android:background="@drawable/btn_merge"
-            android:contentDescription="@string/onscreenMergeCallsText"
-            android:visibility="gone" />
-
-        <!-- "Overflow" -->
-        <ImageButton android:id="@+id/overflowButton"
-            style="@style/InCallButton"
-            android:background="@drawable/btn_overflow"
-            android:contentDescription="@string/onscreenOverflowText"
-            android:visibility="gone" />
-
-        <!-- "Manage conference button (Video Call) " -->
-        <ImageButton android:id="@+id/manageVideoCallConferenceButton"
-            style="@style/InCallButton"
-            android:background="@drawable/ic_group_white_24dp"
-            android:contentDescription="@string/onscreenManageConferenceText"
-            android:visibility="gone" />
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/InCallUI/res/layout/call_card_fragment.xml b/InCallUI/res/layout/call_card_fragment.xml
deleted file mode 100644
index fabde378a..000000000
--- a/InCallUI/res/layout/call_card_fragment.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright (C) 2014 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:id="@+id/primary_call_info_container"
-        android:layout_centerVertical="true"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:elevation="@dimen/primary_call_elevation"
-        android:background="@color/incall_call_banner_background_color"
-        android:clipChildren="false"
-        android:clipToPadding="false"
-        android:alpha="0.9">
-
-        <include layout="@layout/primary_call_info"
-                 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="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:layout_gravity="center_horizontal" />
-
-    </LinearLayout>
-
-    <!-- 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="@dimen/dialpad_elevation"
-        android:layout_height="match_parent" />
-
-    <!-- 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:elevation="4dp"
-             android:layout_alignParentBottom="true" />
-
-    <include layout="@layout/manage_conference_call_button"
-             android:layout_width="match_parent"
-             android:layout_height="wrap_content"
-             android:elevation="5dp"
-             android:layout_alignParentBottom="true"/>
-
-    <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="match_parent"
-                     android:background="@drawable/end_call_background"
-                     android:src="@drawable/fab_ic_end_call"
-                     android:scaleType="center"
-                     android:contentDescription="@string/onscreenEndCallText" />
-
-    </FrameLayout>
-
-    <!-- Progress spinner, useful for indicating pending operations such as upgrade to video. -->
-    <FrameLayout
-        android:id="@+id/progressSpinner"
-        android:background="#63000000"
-        android:layout_width="match_parent"
-        android:layout_height="match_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>
-
-    <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" />
-
-    <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">
-
-            <ImageView android:id="@+id/photoLarge"
-                       android:layout_width="match_parent"
-                       android:layout_height="match_parent"
-                       android:scaleType="centerCrop"
-                       android:contentDescription="@string/contactPhoto"
-                       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/glowpad_background_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>
-    </FrameLayout>
-
-</RelativeLayout>
diff --git a/InCallUI/res/layout/caller_in_conference.xml b/InCallUI/res/layout/caller_in_conference.xml
deleted file mode 100644
index ac78096f6..000000000
--- a/InCallUI/res/layout/caller_in_conference.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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="64dp"
-    android:orientation="horizontal"
-    android:gravity="center_vertical"
-    android:paddingStart="16dp"
-    android:paddingEnd="8dp">
-
-    <!-- Caller information -->
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_weight="1"
-        android:layout_height="match_parent"
-        android:orientation="horizontal"
-        android:gravity="center_vertical">
-
-        <ImageView android:id="@+id/callerPhoto"
-            android:layout_width="@dimen/contact_browser_list_item_photo_size"
-            android:layout_height="@dimen/contact_browser_list_item_photo_size" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:orientation="vertical"
-            android:layout_marginStart="16dp"
-            android:paddingBottom="2dp">
-
-            <!-- Name or number of this caller -->
-            <TextView android:id="@+id/conferenceCallerName"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:textSize="16sp"
-                android:textColor="@color/conference_call_manager_caller_name_text_color"
-                android:singleLine="true"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_marginEnd="2dp" />
-
-            <!-- Number of this caller if name is supplied above -->
-            <LinearLayout
-                 android:layout_width="wrap_content"
-                 android:layout_height="match_parent"
-                 android:orientation="horizontal"
-                 android:gravity="bottom">
-
-                <!-- Number -->
-                <TextView
-                     android:id="@+id/conferenceCallerNumber"
-                     android:layout_width="wrap_content"
-                     android:layout_height="wrap_content"
-                     android:textSize="14sp"
-                     android:ellipsize="marquee"
-                     android:textColor="@color/conference_call_manager_secondary_text_color"
-                     android:singleLine="true"
-                     android:layout_marginEnd="8dp" />
-
-                <!-- Number type -->
-                <TextView
-                    android:id="@+id/conferenceCallerNumberType"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textSize="12sp"
-                    android:textColor="@color/conference_call_manager_secondary_text_color"
-                    android:ellipsize="marquee"
-                    android:singleLine="true"
-                    android:textAllCaps="true"
-                    android:gravity="start" />
-
-            </LinearLayout>  <!-- End of caller number -->
-
-        </LinearLayout>  <!-- End of caller information -->
-
-    </LinearLayout>
-
-    <!-- "Separate" (i.e. "go private") button for this caller -->
-    <ImageView android:id="@+id/conferenceCallerSeparate"
-        android:src="@drawable/ic_call_split_white_24dp"
-        android:layout_width="@dimen/conference_call_manager_button_dimension"
-        android:layout_height="@dimen/conference_call_manager_button_dimension"
-        android:scaleType="center"
-        android:contentDescription="@string/goPrivate"
-        android:tint="@color/conference_call_manager_icon_color"
-        android:background="@drawable/conference_ripple"
-        android:clickable="true" />
-
-    <!-- "Disconnect" button which terminates the connection with this caller. -->
-    <ImageButton
-        android:id="@+id/conferenceCallerDisconnect"
-        android:layout_width="@dimen/conference_call_manager_button_dimension"
-        android:layout_height="@dimen/conference_call_manager_button_dimension"
-        android:layout_marginStart="8dp"
-        android:src="@drawable/ic_call_end_white_24dp"
-        android:scaleType="center"
-        android:contentDescription="@string/onscreenEndCallText"
-        android:tint="@color/conference_call_manager_icon_color"
-        android:background="@drawable/conference_ripple"
-        android:clickable="true" />
-
-</LinearLayout>  <!-- End of single list element -->
diff --git a/InCallUI/res/layout/conference_manager_fragment.xml b/InCallUI/res/layout/conference_manager_fragment.xml
deleted file mode 100644
index 7350bee14..000000000
--- a/InCallUI/res/layout/conference_manager_fragment.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
--->
-
-<!-- The "Manage conference" UI.  This panel is displayed (instead of
-     the inCallPanel) when the user clicks the "Manage conference"
-     button while on a conference call. -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/manageConferencePanel"
-    android:background="@color/conference_call_manager_background_color"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingTop="@dimen/conference_call_manager_padding_top" >
-    <!-- List of conference participants. -->
-    <ListView
-        android:id="@+id/participantList"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:listSelector="@null"
-        android:background="@color/background_dialer_white"
-        android:divider="@null"
-        android:focusableInTouchMode="true"
-        android:focusable="true"/>
-</FrameLayout>
diff --git a/InCallUI/res/layout/incall_dialpad_fragment.xml b/InCallUI/res/layout/incall_dialpad_fragment.xml
deleted file mode 100644
index b567dbbf2..000000000
--- a/InCallUI/res/layout/incall_dialpad_fragment.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2006 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.
--->
-
-<view class="com.android.incallui.DialpadFragment$DialpadSlidingLinearLayout"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/dtmf_twelve_key_dialer_view"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-    <include layout="@layout/dialpad_view"/>
-</view>
diff --git a/InCallUI/res/layout/incall_screen.xml b/InCallUI/res/layout/incall_screen.xml
deleted file mode 100644
index 3922ea073..000000000
--- a/InCallUI/res/layout/incall_screen.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 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.
--->
-
-<!-- In-call Phone UI; see InCallActivity.java. -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@android:color/black"
-    android:id="@+id/main" >
-</FrameLayout>
diff --git a/InCallUI/res/layout/manage_conference_call_button.xml b/InCallUI/res/layout/manage_conference_call_button.xml
deleted file mode 100644
index 01ca1bdc3..000000000
--- a/InCallUI/res/layout/manage_conference_call_button.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 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.
--->
-
-<!-- This button is used only on GSM and IMS devices, during a conference call. -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/manage_conference_call_button"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_alignParentBottom="true"
-    android:background="@color/incall_banner_secondary_background_color"
-    android:visibility="gone">
-
-    <Space android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/secondary_call_info_divider_highlight_color" />
-
-    <!-- This LinearLayout nested immediately in a FrameLayout is necessary to apply both a
-         background color and ripple to the button. -->
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal"
-        android:paddingStart="@dimen/secondary_call_info_horizontal_padding"
-        android:paddingEnd="@dimen/secondary_call_info_horizontal_padding"
-        android:paddingTop="@dimen/secondary_call_info_vertical_padding"
-        android:paddingBottom="@dimen/secondary_call_info_vertical_padding"
-        android:background="?android:attr/selectableItemBackground">
-
-        <!-- Call status of the background call, usually the string "On hold". -->
-        <TextView android:id="@+id/conferenceLabel"
-                  android:layout_width="0dp"
-                  android:layout_height="wrap_content"
-                  android:layout_weight="1"
-                  android:layout_gravity="center_vertical"
-                  android:paddingEnd="18dp"
-                  android:text="@string/onscreenConferenceText"
-                  android:textColor="@color/incall_banner_secondary_text_color"
-                  android:textSize="@dimen/secondary_call_info_text_size"
-                  android:singleLine="true" />
-
-        <ImageView android:id="@+id/manageConferenceImage"
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:src="@drawable/ic_group_white_24dp"
-                   android:tint="@color/incall_banner_secondary_text_color"
-                   android:paddingEnd="16dp"/>
-
-        <TextView android:id="@+id/manageConferenceLabel"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:textColor="@color/incall_banner_secondary_text_color"
-                  android:textSize="@dimen/secondary_call_info_text_size"
-                  android:textAlignment="viewStart"
-                  android:text="@string/onscreenManageText"
-                  android:singleLine="true"/>
-
-    </LinearLayout>
-
-</FrameLayout>
\ No newline at end of file
diff --git a/InCallUI/res/layout/outgoing_call_animation.xml b/InCallUI/res/layout/outgoing_call_animation.xml
deleted file mode 100644
index 69ba3d3c6..000000000
--- a/InCallUI/res/layout/outgoing_call_animation.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright (C) 2014 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
-  -->
-<View xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/outgoing_call_animation_circle"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/incall_background_color" />
\ No newline at end of file
diff --git a/InCallUI/res/layout/person_context_info_list_item.xml b/InCallUI/res/layout/person_context_info_list_item.xml
deleted file mode 100644
index 4f973d564..000000000
--- a/InCallUI/res/layout/person_context_info_list_item.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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.
--->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-     android:layout_width="match_parent"
-     android:layout_height="match_parent"
-     android:paddingRight="@dimen/person_contact_context_horizontal_padding"
-     android:paddingLeft="@dimen/person_contact_context_horizontal_padding">
-     <TextView android:id="@+id/message"
-         android:layout_width="wrap_content"
-         android:layout_height="wrap_content"
-         android:paddingLeft="@dimen/person_contact_context_message_horizontal_padding"
-         android:paddingRight="@dimen/person_contact_context_message_horizontal_padding"
-         android:paddingTop="@dimen/person_contact_context_message_vertical_padding"
-         android:paddingBottom="@dimen/person_contact_context_message_vertical_padding"
-         android:textSize="@dimen/person_contact_context_message_text_size"
-         android:textColor="@color/person_contact_context_message_text_color"
-         android:fontFamily="sans-serif-medium"
-         android:background="@drawable/incoming_sms_background"/>
-      <TextView android:id="@+id/detail"
-         android:layout_width="wrap_content"
-         android:layout_height="wrap_content"
-         android:paddingTop="@dimen/person_contact_context_detail_padding_top"
-         android:textSize="@dimen/person_contact_context_detail_text_size"
-         android:textColor="@color/person_contact_context_detail_text_color"
-         android:fontFamily="sans-serif-medium"
-         android:layout_below="@id/message"/>
-</RelativeLayout>
\ No newline at end of file
diff --git a/InCallUI/res/layout/primary_call_info.xml b/InCallUI/res/layout/primary_call_info.xml
deleted file mode 100644
index cae915224..000000000
--- a/InCallUI/res/layout/primary_call_info.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright (C) 2013 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
-  -->
-
-<!-- "Call Banner" for primary call, the foregound or ringing call. The "call banner" is a block
-    of info about a single call, including the contact name, phone number, call time counter, and
-    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="match_parent"
-        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">
-
-    <LinearLayout android:id="@+id/callSubjectLayout"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="horizontal"
-                  android:clipChildren="false"
-                  android:clipToPadding="false">
-
-        <TextView android:id="@+id/callSubject"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:textAlignment="viewStart"
-                  android:textAppearance="?android:attr/textAppearanceSmall"
-                  android:textColor="@color/incall_call_banner_background_color"
-                  android:textSize="@dimen/call_label_text_size"
-                  android:background="@drawable/subject_bubble"
-                  android:maxLines="2"
-                  android:ellipsize="end"
-                  android:singleLine="false"
-                  android:visibility="gone" />
-    </LinearLayout>
-
-    <LinearLayout android:id="@+id/callStateButton"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:clipChildren="false"
-        android:clipToPadding="false">
-
-        <ImageView android:id="@+id/workProfileIcon"
-            android:src="@drawable/ic_work_profile"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:layout_marginEnd="8dp"
-            android:baselineAlignBottom="true"
-            android:tint="@color/incall_accent_color"
-            android:scaleType="center"
-            android:visibility="gone" />
-
-        <!-- Subscription provider or WiFi calling icon displayed to the left of the label -->
-        <ImageView android:id="@+id/callStateIcon"
-            android:layout_width="24dp"
-            android:layout_height="match_parent"
-            android:layout_marginEnd="10dp"
-            android:tint="@color/incall_accent_color"
-            android:alpha="0.0"
-            android:scaleType="fitCenter"
-            android:visibility="gone" />
-
-        <ImageView android:id="@+id/videoCallIcon"
-            android:src="@drawable/ic_toolbar_video"
-            android:layout_width="16dp"
-            android:layout_height="match_parent"
-            android:layout_marginEnd="16dp"
-            android:baselineAlignBottom="true"
-            android:tint="@color/incall_accent_color"
-            android:scaleType="center"
-            android:visibility="gone" />
-
-        <com.android.phone.common.widget.ResizingTextTextView
-            xmlns:ex="http://schemas.android.com/apk/res-auto"
-            android:id="@+id/callStateLabel"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAlignment="viewStart"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textColor="@color/incall_accent_color"
-            android:textSize="@dimen/call_status_text_size"
-            android:alpha="0.7"
-            android:singleLine="true"
-            android:gravity="start"
-            android:ellipsize="end"
-            ex:resizing_text_min_size="@dimen/call_status_text_min_size" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <!-- Name (or the phone number, if we don't have a name to display). -->
-        <com.android.phone.common.widget.ResizingTextTextView
-            xmlns:ex="http://schemas.android.com/apk/res-auto"
-            android:id="@+id/name"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_marginTop="-5dp"
-            android:fontFamily="sans-serif-light"
-            android:textAlignment="viewStart"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:textSize="@dimen/call_name_text_size"
-            android:singleLine="true"
-            ex:resizing_text_min_size="@dimen/call_name_text_min_size" />
-
-        <!-- 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_centerVertical="true"
-            android:layout_alignParentEnd="true"
-            android:scaleType="centerCrop"
-            android:importantForAccessibility="no"
-            android:src="@drawable/img_no_image_automirrored" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:clipChildren="false"
-        android:clipToPadding="false">
-
-        <ImageView android:id="@+id/hdAudioIcon"
-            android:src="@drawable/ic_hd_24dp"
-            android:layout_width="24dp"
-            android:layout_height="match_parent"
-            android:layout_marginEnd="8dp"
-            android:tint="@color/incall_call_banner_subtext_color"
-            android:scaleType="fitCenter"
-            android:visibility="gone" />
-
-        <ImageView android:id="@+id/forwardIcon"
-            android:src="@drawable/ic_forward_white_24dp"
-            android:layout_width="24dp"
-            android:layout_height="match_parent"
-            android:layout_marginEnd="8dp"
-            android:tint="@color/incall_call_banner_subtext_color"
-            android:scaleType="fitCenter"
-            android:visibility="gone" />
-
-        <ImageView android:id="@+id/spamIcon"
-            android:src="@drawable/ic_report_24dp"
-            android:layout_width="24dp"
-            android:layout_height="match_parent"
-            android:layout_marginEnd="8dp"
-            android:scaleType="fitCenter"
-            android:visibility="gone" />
-
-        <!-- Label (like "Mobile" or "Work", if present) and phone number, side by side -->
-        <LinearLayout android:id="@+id/labelAndNumber"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="horizontal">
-
-            <TextView android:id="@+id/label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="@color/incall_call_banner_subtext_color"
-                android:textSize="@dimen/call_label_text_size"
-                android:singleLine="true"
-                android:textDirection="ltr"
-                android:visibility="gone" />
-
-            <TextView android:id="@+id/phoneNumber"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:layout_marginStart="6dp"
-                android:textAlignment="viewStart"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="@color/incall_call_banner_subtext_color"
-                android:textSize="@dimen/call_label_text_size"
-                android:singleLine="false"
-                android:visibility="gone" />
-
-        </LinearLayout>
-
-        <!-- Elapsed time indication for a call in progress. -->
-        <TextView android:id="@+id/elapsedTime"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:textAlignment="viewEnd"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="@color/incall_call_banner_subtext_color"
-            android:textSize="@dimen/call_label_text_size"
-            android:singleLine="true"
-            android:visibility="gone" />
-
-    </LinearLayout>
-
-    <!-- Call type indication: a special label and/or branding
-     for certain kinds of calls (like "SIP call" for a SIP call.) -->
-    <TextView android:id="@+id/callTypeLabel"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="@color/incall_call_banner_text_color"
-        android:maxLines="1"
-        android:ellipsize="end"
-        android:visibility="gone" />
-
-</LinearLayout> <!-- End of call_banner -->
diff --git a/InCallUI/res/layout/secondary_call_info.xml b/InCallUI/res/layout/secondary_call_info.xml
deleted file mode 100644
index e866795a6..000000000
--- a/InCallUI/res/layout/secondary_call_info.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 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.
--->
-
-<!-- XML resource file for secondary call info, which will be used by CallCard. -->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/secondary_call_info"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_alignParentBottom="true"
-    android:background="@color/incall_banner_secondary_background_color"
-    android:visibility="gone">
-
-    <Space android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/secondary_call_info_divider_highlight_color" />
-
-    <!-- This LinearLayout nested immediately in a FrameLayout is necessary to apply both a
-         background color and ripple to the button. -->
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal"
-        android:paddingStart="@dimen/secondary_call_info_horizontal_padding"
-        android:paddingEnd="@dimen/secondary_call_info_horizontal_padding"
-        android:paddingTop="@dimen/secondary_call_info_vertical_padding"
-        android:paddingBottom="@dimen/secondary_call_info_vertical_padding"
-        android:background="?android:attr/selectableItemBackground">
-
-        <ImageView android:id="@+id/secondaryCallVideoCallIcon"
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:src="@drawable/ic_toolbar_video"
-                   android:tint="@color/incall_banner_secondary_text_color"
-                   android:paddingEnd="16dp"/>
-
-        <ImageView android:id="@+id/secondaryCallConferenceCallIcon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_group_white_24dp"
-            android:tint="@color/incall_banner_secondary_text_color"
-            android:paddingEnd="16dp"/>
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:orientation="vertical">
-
-            <!-- Name (or the phone number, if we don't have a name to display). -->
-            <TextView android:id="@+id/secondaryCallName"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textColor="@color/incall_banner_secondary_text_color"
-                android:textSize="@dimen/secondary_call_info_text_size"
-                android:textAlignment="viewStart"
-                android:ellipsize="marquee"
-                android:singleLine="true"/>
-
-            <!-- Provider, e.g. AT&T, that a call is associated with -->
-            <LinearLayout android:id="@+id/secondary_call_provider_info"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:visibility="gone" >
-
-                <TextView android:id="@+id/secondaryCallProviderLabel"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/incall_banner_secondary_text_color"
-                    android:textSize="@dimen/secondary_call_info_text_size"
-                    android:textAlignment="viewStart"
-                    android:singleLine="true"/>
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <!-- Call status of the background call, usually the string "On hold". -->
-        <TextView android:id="@+id/secondaryCallStatus"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:paddingEnd="18dp"
-            android:text="@string/onHold"
-            android:textColor="@color/incall_banner_secondary_text_color"
-            android:textSize="@dimen/secondary_call_info_text_size"
-            android:singleLine="true" />
-
-    </LinearLayout>
-
-</FrameLayout>
diff --git a/InCallUI/res/layout/video_call_fragment.xml b/InCallUI/res/layout/video_call_fragment.xml
deleted file mode 100644
index d5e11ef4a..000000000
--- a/InCallUI/res/layout/video_call_fragment.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright (C) 2014 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
-  -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <ViewStub
-        android:id="@+id/videoCallViewsStub"
-        android:inflatedId="@+id/videoCallViews"
-        android:layout="@layout/video_call_views"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</FrameLayout>
\ No newline at end of file
diff --git a/InCallUI/res/layout/video_call_views.xml b/InCallUI/res/layout/video_call_views.xml
deleted file mode 100644
index d514f6df1..000000000
--- a/InCallUI/res/layout/video_call_views.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright (C) 2014 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
-  -->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <TextureView
-        android:id="@+id/incomingVideo"
-        android:layout_gravity="center"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-    <!-- The width and height are replaced at runtime based on the selected camera. -->
-    <FrameLayout
-        android:id="@+id/previewVideoContainer"
-        android:layout_width="70dp"
-        android:layout_height="0dp"
-        android:layout_gravity="bottom|right"
-        android:layout_margin="@dimen/video_preview_margin" >
-
-        <!-- The video preview surface, where the user's outgoing video is shown. -->
-        <TextureView
-            android:id="@+id/previewVideo"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-        <!-- The user's profile photo, shown when the user's camera is shut off. -->
-        <ImageView
-            android:id="@+id/previewProfilePhoto"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="centerInside"
-            android:adjustViewBounds="false"
-            android:contentDescription="@string/profile_photo_description"
-            android:background="@android:color/black"
-            android:visibility="gone" />
-
-        <!-- The "camera off" icon, shown when the user's camera is shut off. -->
-        <ImageView
-            android:id="@+id/previewCameraOff"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom|right"
-            android:layout_marginEnd="10dp"
-            android:layout_marginBottom="10dp"
-            android:scaleType="centerCrop"
-            android:contentDescription="@string/camera_off_description"
-            android:src="@drawable/ic_toolbar_video_off"
-            android:visibility="gone" />
-    </FrameLayout>
-</FrameLayout>
-- 
cgit v1.2.3