From 711dc8f9e23a86e113171c8d5d9dcac728fd8027 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A1s=20Kurucz?= <kurucz@google.com>
Date: Thu, 25 Aug 2022 09:55:02 +0000
Subject: [PATCH] Fix RTL layout for Notifications history

Using ConstraintLayout Guideline is causing an issue with RTL languages.

Test: check the Last 24hrs Notification history using forced RTL layout direction and different Display and Text sizes

Fixes: 243029840
Change-Id: Ia0807d94da4ad5aac7c8000460388ddb6ddbe987
---
 res/layout/notification_history_app_layout.xml | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/res/layout/notification_history_app_layout.xml b/res/layout/notification_history_app_layout.xml
index 7d53b4d4142..143fff8f7e5 100644
--- a/res/layout/notification_history_app_layout.xml
+++ b/res/layout/notification_history_app_layout.xml
@@ -35,42 +35,36 @@
             android:id="@+id/icon"
             android:layout_width="24dp"
             android:layout_height="24dp"
-            android:layout_marginEnd="14dp"
             android:scaleType="centerInside"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/text_start_guideline"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/text_start_guideline"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            app:layout_constraintStart_toEndOf="@id/icon" />
-
         <TextView
             android:id="@+id/label"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginStart="14dp"
             android:ellipsize="end"
             android:lines="1"
             android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification.Title"
+            android:textDirection="locale"
             app:layout_constraintBottom_toTopOf="@id/count"
             app:layout_constraintEnd_toStartOf="@id/expand_button_wrapper"
-            app:layout_constraintStart_toEndOf="@id/text_start_guideline"
+            app:layout_constraintStart_toEndOf="@id/icon"
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/count"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginStart="14dp"
             android:paddingTop="4dp"
             android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification"
             android:textDirection="locale"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/expand_button_wrapper"
-            app:layout_constraintStart_toEndOf="@id/text_start_guideline"
+            app:layout_constraintStart_toEndOf="@id/icon"
             app:layout_constraintTop_toBottomOf="@id/label" />
 
         <FrameLayout