From 192509f7620f37266d76caf2ec945bae383f3f34 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Fri, 5 Aug 2022 15:01:49 -0300
Subject: [PATCH] Fix action bar layout insets.

---
 app/src/main/res/layout/action_mode_close_layout.xml | 10 +++++-----
 app/src/main/res/values/styles.xml                   |  1 -
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/layout/action_mode_close_layout.xml b/app/src/main/res/layout/action_mode_close_layout.xml
index 71c0a7e994..ec45141db1 100644
--- a/app/src/main/res/layout/action_mode_close_layout.xml
+++ b/app/src/main/res/layout/action_mode_close_layout.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ImageView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/action_mode_close_button"
     android:layout_width="24dp"
     android:layout_height="24dp"
     android:layout_marginStart="16dp"
-    android:layout_marginEnd="24dp"
-    app:srcCompat="@drawable/ic_x_24" >
-</ImageView>
\ No newline at end of file
+    android:layout_marginEnd="32dp"
+    android:contentDescription="@string/Material3SearchToolbar__close"
+    android:scaleType="centerInside"
+    app:srcCompat="@drawable/ic_x_24" />
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 71b03b85a1..5e1160b93f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -378,7 +378,6 @@
         <item name="titleTextStyle">@style/Signal.Text.TitleLarge</item>
         <item name="closeItemLayout">@layout/action_mode_close_layout</item>
         <item name="theme">@style/Signal.ActionModeTheme</item>
-        <item name="android:paddingStart">10dp</item>
         <item name="height">@dimen/signal_m3_toolbar_height</item>
     </style>