1 files changed, 42 insertions, 45 deletions
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>