From cf0d54d04f8445bcd2e616e1b874bd2e4125cdac Mon Sep 17 00:00:00 2001
From: Fumiaki Yoshimatsu <fumiakiy@gmail.com>
Date: Sat, 13 Nov 2021 10:00:41 -0500
Subject: [PATCH] Fix the profile image on the toolbar may get clamped in RTL
 layout in some Android versions.

The bug was [reported in the Beta forum by Xashyar](https://community.signalusers.org/t/beta-feedback-for-the-upcoming-android-5-26-release/38629/36).
---
 app/src/main/res/layout/conversation_title_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/conversation_title_view.xml b/app/src/main/res/layout/conversation_title_view.xml
index 420be77ee8..e96ff6291f 100644
--- a/app/src/main/res/layout/conversation_title_view.xml
+++ b/app/src/main/res/layout/conversation_title_view.xml
@@ -13,7 +13,8 @@
         android:transitionName="avatar"
         android:id="@+id/contact_photo_container"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:layout_marginEnd="10dp">
 
         <org.thoughtcrime.securesms.components.AvatarImageView
             android:id="@+id/contact_photo_image"
@@ -21,7 +22,6 @@
             android:layout_height="36dp"
             android:layout_alignParentStart="true"
             android:layout_centerVertical="true"
-            android:layout_marginEnd="10dp"
             android:clickable="true"
             android:contentDescription="@string/conversation_list_item_view__contact_photo_image"
             android:cropToPadding="true"