2 files changed, 17 insertions, 12 deletions
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 ed29e78c4..3b3327d4f 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
@@ -24,8 +24,8 @@
 
   <ImageView
       android:id="@id/answer_message_image"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:layout_height="match_parent"
       android:layout_marginTop="@dimen/answer_message_contents_margin_top"
       android:layout_marginBottom="4dp"
       android:layout_centerInParent="true"
@@ -34,7 +34,7 @@
       android:background="@drawable/answer_data_background"
       android:elevation="@dimen/answer_data_elevation"
       android:adjustViewBounds="true"
-      android:scaleType="fitCenter"/>
+      android:scaleType="centerCrop"/>
 
   <ProgressBar
       android:layout_width="wrap_content"
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 d2147ea62..b93db63ad 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
@@ -16,29 +16,34 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     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.support.v7.widget.AppCompatTextView
       android:id="@id/answer_message_text"
-      android:layout_width="match_parent"
+      android:layout_width="wrap_content"
       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:gravity="center"
+      android:paddingTop="22dp"
+      android:paddingBottom="22dp"
+      android:paddingStart="32dp"
+      android:paddingEnd="32dp"
+      android:minHeight="108dp"
+      android:lineSpacingMultiplier="1.2"
       android:textColor="@color/background_dialer_white"
-      android:textAppearance="@style/Dialer.Incall.TextAppearance.Message"/>
+      android:textAppearance="@style/Dialer.Incall.TextAppearance.Message"
+      android:background="@drawable/answer_text_only_background"
+      app:autoSizeTextType="uniform"
+      app:autoSizeMaxTextSize="44sp"/>
 
   <ImageView
       android:id="@id/answer_message_avatar"