Update Dialer to V10 RC16

This release was created following the instructions at:
go/dialer-aosp-release

Subsequent dialer releases will follow as O bugs are
fixed, until we reach our final RC.

Version: 10
Candidate: RC16
Branch: dialer-android_release_branch/153304843.1
dialer-android/dialer-android_20170416.00/dialer-android_20170416.00_RC16

This release contains the following bug fixes since RC00:
Bug: 37324705 35304403 36067503 35304446 33203808 37280992
37346084 35766990 37481880 37424493 36470282 37347691
37519015 37168472 35805360 37545472 27704934 36515614
35766990 37577470 34739750 35801628 36788693 35264204
36708536 37628370 36904650 37314436 37642171 37530847
37637799 37666625 37548549 37648036 37636412 37323529
37630507 35919141 37198343 37548572 36178218 37640315
37663896 37720467 37275944 37710497 31634477 37744796
37348506 37744796 37568534 37672424 34872683 34873026
37681461 34873295 37748373 37526812 37618638 37663896
37536088 37727455 37165687 36651204 36900708 37323529
36902926 37256480 37328353 37432034 37436952 34093562
37720889 37321935 37780300 37781115 37755902 36588206
34258266 37290464 37698062 37618638 37473004 37432034
37918676 37870494 37722091

Test: make, on device
Change-Id: I99e1a484ccd578c1f8a13e7a6a4b4952f0791297

8 files changed, 322 insertions, 272 deletions

diff --git a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_frag.xml b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_frag.xml
index ed2bee0d1..e5c879888 100644
--- a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_frag.xml
+++ b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_frag.xml
@@ -15,28 +15,28 @@
   ~ 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:paddingTop="16dp"
-  android:paddingStart="16dp"
-  android:paddingEnd="24dp"
-  android:orientation="horizontal">
-
-  <ImageView
-    android:id="@id/answer_message_avatar"
-    android:layout_width="@dimen/answer_message_avatar_size"
-    android:layout_height="@dimen/answer_message_avatar_size"
-    android:elevation="@dimen/answer_data_elevation"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="16dp"
+    android:paddingStart="@dimen/answer_message_margin_start_end"
+    android:paddingEnd="@dimen/answer_message_margin_start_end">
 
   <FrameLayout
-    android:id="@id/answer_message_frag"
-    android:layout_width="0dp"
-    android:layout_height="wrap_content"
-    android:layout_weight="1"
-    android:layout_marginBottom="4dp"
-    android:layout_marginStart="8dp"
-    android:background="@drawable/answer_data_background"
-    android:elevation="@dimen/answer_data_elevation"
-    android:outlineProvider="background"/>
-</LinearLayout>
+      android:id="@id/answer_message_frag"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/answer_message_contents_margin_top"
+      android:layout_marginBottom="4dp"
+      android:layout_alignTop="@+id/answer_message_avatar"
+      android:background="@drawable/answer_data_background"
+      android:elevation="@dimen/answer_data_elevation"
+      android:outlineProvider="background"/>
+
+  <ImageView
+      android:id="@id/answer_message_avatar"
+      android:layout_width="@dimen/answer_message_avatar_size"
+      android:layout_height="@dimen/answer_message_avatar_size"
+      android:layout_centerHorizontal="true"
+      android:elevation="@dimen/answer_avatar_elevation"/>
+</RelativeLayout>
diff --git a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_image.xml b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_image.xml
index 431a178c2..ed29e78c4 100644
--- a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_image.xml
+++ b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_image.xml
@@ -16,36 +16,37 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="wrap_content"
-  android:paddingTop="16dp"
-  android:paddingStart="16dp"
-  android:paddingEnd="24dp">
-
-  <ImageView
-    android:id="@id/answer_message_avatar"
-    android:layout_width="@dimen/answer_message_avatar_size"
-    android:layout_height="@dimen/answer_message_avatar_size"
-    android:elevation="@dimen/answer_data_elevation"/>
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="16dp"
+    android:paddingStart="@dimen/answer_message_margin_start_end"
+    android:paddingEnd="@dimen/answer_message_margin_start_end">
 
   <ImageView
-    android:id="@id/answer_message_image"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginBottom="4dp"
-    android:layout_marginStart="8dp"
-    android:layout_centerInParent="true"
-    android:layout_toEndOf="@+id/answer_message_avatar"
-    android:background="@drawable/answer_data_background"
-    android:elevation="@dimen/answer_data_elevation"
-    android:outlineProvider="background"
-    android:adjustViewBounds="true"
-    android:scaleType="fitCenter"/>
+      android:id="@id/answer_message_image"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/answer_message_contents_margin_top"
+      android:layout_marginBottom="4dp"
+      android:layout_centerInParent="true"
+      android:layout_alignTop="@+id/answer_message_avatar"
+      android:outlineProvider="background"
+      android:background="@drawable/answer_data_background"
+      android:elevation="@dimen/answer_data_elevation"
+      android:adjustViewBounds="true"
+      android:scaleType="fitCenter"/>
 
   <ProgressBar
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:id="@+id/loading_spinner"
-    android:layout_centerInParent="true"
-    android:elevation="2dp"/>
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:id="@+id/loading_spinner"
+      android:layout_centerInParent="true"
+      android:elevation="@dimen/answer_data_elevation"/>
+
+  <ImageView
+      android:id="@id/answer_message_avatar"
+      android:layout_width="@dimen/answer_message_avatar_size"
+      android:layout_height="@dimen/answer_message_avatar_size"
+      android:layout_centerHorizontal="true"
+      android:elevation="@dimen/answer_avatar_elevation"/>
 </RelativeLayout>
diff --git a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_image_frag.xml b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_image_frag.xml
index c816418fc..1cb234784 100644
--- a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_image_frag.xml
+++ b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_image_frag.xml
@@ -15,53 +15,50 @@
   ~ limitations under the License
   -->
 
-<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:paddingTop="16dp"
-  android:paddingStart="16dp"
-  android:paddingEnd="24dp"
-  android:orientation="horizontal">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="16dp"
+    android:paddingStart="@dimen/answer_message_margin_start_end"
+    android:paddingEnd="@dimen/answer_message_margin_start_end">
 
-  <ImageView
-    android:id="@id/answer_message_avatar"
-    android:layout_width="@dimen/answer_message_avatar_size"
-    android:layout_height="@dimen/answer_message_avatar_size"
-    android:layout_rowSpan="2"
-    android:elevation="@dimen/answer_data_elevation"/>
+  <LinearLayout
+      android:id="@id/answer_message_container"
+      android:orientation="horizontal"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:layout_marginTop="@dimen/answer_message_contents_margin_top"
+      android:layout_alignTop="@+id/answer_message_avatar"
+      android:layout_marginBottom="@dimen/answer_data_elevation"
+      android:elevation="@dimen/answer_data_elevation"
+      android:background="@drawable/answer_data_background"
+      android:outlineProvider="background">
 
-  <ImageView
-    android:id="@id/answer_message_image"
-    android:layout_width="0dp"
-    android:layout_height="0dp"
-    android:layout_marginStart="8dp"
-    android:layout_columnWeight="1"
-    android:layout_rowWeight="1"
-    android:background="@drawable/answer_data_background"
-    android:elevation="@dimen/answer_data_elevation"
-    android:outlineProvider="background"
-    android:scaleType="centerCrop"/>
+    <ImageView
+        android:id="@id/answer_message_image"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:scaleType="centerCrop"/>
+
+    <FrameLayout
+        android:id="@id/answer_message_frag"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1"/>
+  </LinearLayout>
 
   <ProgressBar
-    android:id="@+id/loading_spinner"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_column="1"
-    android:layout_gravity="center"
-    android:elevation="2dp"/>
+      android:id="@+id/loading_spinner"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_centerInParent="true"
+      android:elevation="@dimen/answer_data_elevation"/>
 
-  <FrameLayout
-    android:id="@id/answer_message_frag"
-    android:layout_width="0dp"
-    android:layout_height="0dp"
-    android:layout_marginTop="4dp"
-    android:layout_marginBottom="4dp"
-    android:layout_marginStart="8dp"
-    android:layout_column="1"
-    android:layout_columnWeight="1"
-    android:layout_row="1"
-    android:layout_rowWeight="1"
-    android:background="@drawable/answer_data_background"
-    android:elevation="@dimen/answer_data_elevation"
-    android:outlineProvider="background"/>
-</GridLayout>
+  <ImageView
+      android:id="@id/answer_message_avatar"
+      android:layout_width="@dimen/answer_message_avatar_size"
+      android:layout_height="@dimen/answer_message_avatar_size"
+      android:layout_centerHorizontal="true"
+      android:elevation="@dimen/answer_avatar_elevation"/>
+</RelativeLayout>
diff --git a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text.xml b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text.xml
index c69973042..d2147ea62 100644
--- a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text.xml
+++ b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text.xml
@@ -15,29 +15,35 @@
   ~ 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:paddingTop="16dp"
-  android:paddingStart="16dp"
-  android:paddingEnd="24dp"
-  android:orientation="horizontal">
-
-  <ImageView
-    android:id="@id/answer_message_avatar"
-    android:layout_width="@dimen/answer_message_avatar_size"
-    android:layout_height="@dimen/answer_message_avatar_size"
-    android:elevation="@dimen/answer_data_elevation"/>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="16dp"
+    android:paddingStart="@dimen/answer_message_margin_start_end"
+    android:paddingEnd="@dimen/answer_message_margin_start_end">
 
   <TextView
-    android:id="@id/answer_message_text"
-    android:layout_width="0dp"
-    android:layout_height="wrap_content"
-    android:layout_weight="1"
-    android:layout_marginBottom="4dp"
-    android:layout_marginStart="8dp"
-    android:padding="18dp"
-    android:background="@drawable/answer_data_background"
-    android:elevation="@dimen/answer_data_elevation"
-    android:textAppearance="@style/Dialer.Incall.TextAppearance.Message"/>
-</LinearLayout>
+      android:id="@id/answer_message_text"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="@dimen/answer_message_contents_margin_top"
+      android:layout_marginBottom="4dp"
+      android:layout_centerHorizontal="true"
+      android:layout_alignTop="@+id/answer_message_avatar"
+      android:paddingTop="44dp"
+      android:paddingBottom="44dp"
+      android:paddingStart="18dp"
+      android:paddingEnd="18dp"
+      android:background="@drawable/answer_text_only_background"
+      android:elevation="@dimen/answer_data_elevation"
+      android:gravity="center_horizontal"
+      android:textColor="@color/background_dialer_white"
+      android:textAppearance="@style/Dialer.Incall.TextAppearance.Message"/>
+
+  <ImageView
+      android:id="@id/answer_message_avatar"
+      android:layout_width="@dimen/answer_message_avatar_size"
+      android:layout_height="@dimen/answer_message_avatar_size"
+      android:layout_centerHorizontal="true"
+      android:elevation="@dimen/answer_avatar_elevation"/>
+</RelativeLayout>
diff --git a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text_frag.xml b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text_frag.xml
index 5a1cf728b..4a73ef619 100644
--- a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text_frag.xml
+++ b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text_frag.xml
@@ -15,47 +15,47 @@
   ~ limitations under the License
   -->
 
-<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:paddingTop="16dp"
-  android:paddingStart="16dp"
-  android:paddingEnd="24dp"
-  android:orientation="horizontal">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="16dp"
+    android:paddingStart="@dimen/answer_message_margin_start_end"
+    android:paddingEnd="@dimen/answer_message_margin_start_end">
 
-  <ImageView
-    android:id="@id/answer_message_avatar"
-    android:layout_width="@dimen/answer_message_avatar_size"
-    android:layout_height="@dimen/answer_message_avatar_size"
-    android:layout_rowSpan="2"
-    android:elevation="@dimen/answer_data_elevation"/>
+  <LinearLayout
+      android:id="@id/answer_message_container"
+      android:orientation="vertical"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:layout_marginTop="@dimen/answer_message_contents_margin_top"
+      android:layout_alignTop="@+id/answer_message_avatar"
+      android:layout_marginBottom="@dimen/answer_data_elevation"
+      android:elevation="@dimen/answer_data_elevation"
+      android:background="@drawable/answer_data_background"
+      android:outlineProvider="background">
+
+    <FrameLayout
+        android:id="@id/answer_message_frag"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="3"/>
 
-  <TextView
-    android:id="@id/answer_message_text"
-    android:layout_width="0dp"
-    android:layout_height="0dp"
-    android:layout_marginStart="8dp"
-    android:layout_columnWeight="1"
-    android:layout_rowWeight="1"
-    android:padding="18dp"
-    android:background="@drawable/answer_data_background"
-    android:elevation="@dimen/answer_data_elevation"
-    android:gravity="center_vertical"
-    android:maxLines="2"
-    android:textAppearance="@style/Dialer.Incall.TextAppearance.Message"/>
+    <TextView
+        android:id="@id/answer_message_text"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="2"
+        android:paddingStart="18dp"
+        android:paddingEnd="18dp"
+        android:gravity="center"
+        android:maxLines="2"
+        android:textAppearance="@style/Dialer.Incall.TextAppearance.Message"/>
+  </LinearLayout>
 
-  <FrameLayout
-    android:id="@id/answer_message_frag"
-    android:layout_width="0dp"
-    android:layout_height="0dp"
-    android:layout_marginTop="4dp"
-    android:layout_marginBottom="4dp"
-    android:layout_marginStart="8dp"
-    android:layout_column="1"
-    android:layout_columnWeight="1"
-    android:layout_row="1"
-    android:layout_rowWeight="1"
-    android:background="@drawable/answer_data_background"
-    android:elevation="@dimen/answer_data_elevation"
-    android:outlineProvider="background"/>
-</GridLayout>
+  <ImageView
+      android:id="@id/answer_message_avatar"
+      android:layout_width="@dimen/answer_message_avatar_size"
+      android:layout_height="@dimen/answer_message_avatar_size"
+      android:layout_centerHorizontal="true"
+      android:elevation="@dimen/answer_avatar_elevation"/>
+</RelativeLayout>
\ No newline at end of file
diff --git a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text_image.xml b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text_image.xml
index 4e6fcbadb..828675b6b 100644
--- a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text_image.xml
+++ b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text_image.xml
@@ -15,56 +15,55 @@
   ~ limitations under the License
   -->
 
-<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:paddingTop="16dp"
-  android:paddingStart="16dp"
-  android:paddingEnd="24dp"
-  android:orientation="horizontal">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="16dp"
+    android:paddingStart="@dimen/answer_message_margin_start_end"
+    android:paddingEnd="@dimen/answer_message_margin_start_end">
 
-  <ImageView
-    android:id="@id/answer_message_avatar"
-    android:layout_width="@dimen/answer_message_avatar_size"
-    android:layout_height="@dimen/answer_message_avatar_size"
-    android:layout_rowSpan="2"
-    android:elevation="@dimen/answer_data_elevation"/>
+  <LinearLayout
+      android:id="@id/answer_message_container"
+      android:orientation="vertical"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:layout_marginTop="@dimen/answer_message_contents_margin_top"
+      android:layout_alignTop="@+id/answer_message_avatar"
+      android:layout_marginBottom="@dimen/answer_data_elevation"
+      android:elevation="@dimen/answer_data_elevation"
+      android:background="@drawable/answer_data_background"
+      android:outlineProvider="background">
 
-  <TextView
-    android:id="@id/answer_message_text"
-    android:layout_width="0dp"
-    android:layout_height="0dp"
-    android:layout_marginStart="8dp"
-    android:layout_columnWeight="1"
-    android:layout_rowWeight="1"
-    android:padding="18dp"
-    android:background="@drawable/answer_data_background"
-    android:elevation="@dimen/answer_data_elevation"
-    android:gravity="center_vertical"
-    android:maxLines="2"
-    android:textAppearance="@style/Dialer.Incall.TextAppearance.Message"/>
+    <ImageView
+        android:id="@id/answer_message_image"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="3"
+        android:scaleType="centerCrop"/>
 
-  <ImageView
-    android:id="@id/answer_message_image"
-    android:layout_width="0dp"
-    android:layout_height="0dp"
-    android:layout_marginTop="4dp"
-    android:layout_marginBottom="4dp"
-    android:layout_marginStart="8dp"
-    android:layout_column="1"
-    android:layout_columnWeight="1"
-    android:layout_row="1"
-    android:layout_rowWeight="1"
-    android:background="@drawable/answer_data_background"
-    android:elevation="@dimen/answer_data_elevation"
-    android:outlineProvider="background"
-    android:scaleType="centerCrop"/>
+    <TextView
+        android:id="@id/answer_message_text"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="2"
+        android:paddingStart="18dp"
+        android:paddingEnd="18dp"
+        android:gravity="center"
+        android:maxLines="2"
+        android:textAppearance="@style/Dialer.Incall.TextAppearance.Message"/>
+  </LinearLayout>
 
   <ProgressBar
-    android:id="@+id/loading_spinner"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_column="1"
-    android:layout_gravity="center"
-    android:elevation="2dp"/>
-</GridLayout>
+      android:id="@+id/loading_spinner"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_centerInParent="true"
+      android:elevation="@dimen/answer_data_elevation"/>
+
+  <ImageView
+      android:id="@id/answer_message_avatar"
+      android:layout_width="@dimen/answer_message_avatar_size"
+      android:layout_height="@dimen/answer_message_avatar_size"
+      android:layout_centerHorizontal="true"
+      android:elevation="@dimen/answer_avatar_elevation"/>
+</RelativeLayout>
\ No newline at end of file
diff --git a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text_image_frag.xml b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text_image_frag.xml
index ffbe41bbd..4abdbb25d 100644
--- a/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text_image_frag.xml
+++ b/java/com/android/incallui/sessiondata/res/layout/fragment_composer_text_image_frag.xml
@@ -15,72 +15,68 @@
   ~ limitations under the License
   -->
 
-<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:paddingTop="16dp"
-  android:paddingStart="16dp"
-  android:paddingEnd="24dp"
-  android:orientation="horizontal">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="16dp"
+    android:paddingStart="@dimen/answer_message_margin_start_end"
+    android:paddingEnd="@dimen/answer_message_margin_start_end">
 
-  <ImageView
-    android:id="@id/answer_message_avatar"
-    android:layout_width="@dimen/answer_message_avatar_size"
-    android:layout_height="@dimen/answer_message_avatar_size"
-    android:layout_rowSpan="2"
-    android:elevation="@dimen/answer_data_elevation"/>
+  <LinearLayout
+      android:id="@id/answer_message_container"
+      android:orientation="vertical"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:layout_marginTop="@dimen/answer_message_contents_margin_top"
+      android:layout_alignTop="@+id/answer_message_avatar"
+      android:layout_marginBottom="@dimen/answer_data_elevation"
+      android:elevation="@dimen/answer_data_elevation"
+      android:background="@drawable/answer_data_background"
+      android:outlineProvider="background">
 
-  <TextView
-    android:id="@id/answer_message_text"
-    android:layout_width="0dp"
-    android:layout_height="0dp"
-    android:layout_marginStart="8dp"
-    android:layout_columnWeight="2"
-    android:layout_columnSpan="2"
-    android:layout_rowWeight="1"
-    android:padding="18dp"
-    android:background="@drawable/answer_data_background"
-    android:elevation="@dimen/answer_data_elevation"
-    android:gravity="center_vertical"
-    android:maxLines="2"
-    android:textAppearance="@style/Dialer.Incall.TextAppearance.Message"/>
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="3">
 
-  <ImageView
-    android:id="@id/answer_message_image"
-    android:layout_width="0dp"
-    android:layout_height="0dp"
-    android:layout_marginTop="4dp"
-    android:layout_marginBottom="4dp"
-    android:layout_marginStart="8dp"
-    android:layout_column="1"
-    android:layout_columnWeight="1"
-    android:layout_row="1"
-    android:layout_rowWeight="1"
-    android:background="@drawable/answer_data_background"
-    android:elevation="@dimen/answer_data_elevation"
-    android:outlineProvider="background"
-    android:scaleType="centerCrop"/>
+      <ImageView
+          android:id="@id/answer_message_image"
+          android:layout_width="0dp"
+          android:layout_height="match_parent"
+          android:layout_weight="1"
+          android:scaleType="centerCrop"/>
+
+      <FrameLayout
+          android:id="@id/answer_message_frag"
+          android:layout_width="0dp"
+          android:layout_height="match_parent"
+          android:layout_weight="1"/>
+    </LinearLayout>
+
+    <TextView
+        android:id="@id/answer_message_text"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="2"
+        android:paddingStart="18dp"
+        android:paddingEnd="18dp"
+        android:gravity="center"
+        android:maxLines="2"
+        android:textAppearance="@style/Dialer.Incall.TextAppearance.Message"/>
+  </LinearLayout>
 
   <ProgressBar
-    android:id="@+id/loading_spinner"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_column="1"
-    android:layout_gravity="center"
-    android:elevation="2dp"/>
+      android:id="@+id/loading_spinner"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_centerInParent="true"
+      android:elevation="@dimen/answer_data_elevation"/>
 
-  <FrameLayout
-    android:id="@id/answer_message_frag"
-    android:layout_width="0dp"
-    android:layout_height="0dp"
-    android:layout_marginTop="4dp"
-    android:layout_marginBottom="4dp"
-    android:layout_marginStart="8dp"
-    android:layout_column="2"
-    android:layout_columnWeight="1"
-    android:layout_row="1"
-    android:layout_rowWeight="1"
-    android:background="@drawable/answer_data_background"
-    android:elevation="@dimen/answer_data_elevation"
-    android:outlineProvider="background"/>
-</GridLayout>
+  <ImageView
+      android:id="@id/answer_message_avatar"
+      android:layout_width="@dimen/answer_message_avatar_size"
+      android:layout_height="@dimen/answer_message_avatar_size"
+      android:layout_centerHorizontal="true"
+      android:elevation="@dimen/answer_avatar_elevation"/>
+</RelativeLayout>
\ No newline at end of file
diff --git a/java/com/android/incallui/sessiondata/res/layout/fragment_spam.xml b/java/com/android/incallui/sessiondata/res/layout/fragment_spam.xml
new file mode 100644
index 000000000..ccf69a50c
--- /dev/null
+++ b/java/com/android/incallui/sessiondata/res/layout/fragment_spam.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2017 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"
+    android:paddingTop="16dp"
+    android:paddingStart="@dimen/answer_message_margin_start_end"
+    android:paddingEnd="@dimen/answer_message_margin_start_end"
+    android:elevation="@dimen/answer_data_elevation">
+
+  <LinearLayout
+      android:orientation="vertical"
+      android:layout_width="match_parent"
+      android:layout_height="204dp"
+      android:layout_gravity="center"
+      android:padding="16dp"
+      android:gravity="center"
+      android:outlineProvider="background"
+      android:background="@drawable/spam_container_background">
+
+    <ImageView
+        android:id="@+id/spam_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="18dp"
+        android:src="@drawable/quantum_ic_image_white_24"
+        android:tint="#546e7a"/>
+
+    <TextView
+        android:id="@+id/spam_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/spam_photo_text"
+        android:textColor="#546e7a"
+        android:textSize="12sp"/>
+  </LinearLayout>
+</FrameLayout>
\ No newline at end of file