From f947ac20c1c0f5c191f5243f94c713b06e4bb139 Mon Sep 17 00:00:00 2001
From: Evan Severson <evanseverson@google.com>
Date: Fri, 8 Apr 2022 14:36:12 -0700
Subject: [PATCH] Fix RTL mode for FGS manager

Test: Manual in both RTL and LTR
Fixes: 228168361
Change-Id: If415a85858a9759505a99722c8905bbb0b2421b8
---
 packages/SystemUI/res/layout/fgs_manager_app_item.xml | 6 +++---
 packages/SystemUI/res/values/styles.xml               | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/SystemUI/res/layout/fgs_manager_app_item.xml b/packages/SystemUI/res/layout/fgs_manager_app_item.xml
index d034f4e512a31..30bce9d844895 100644
--- a/packages/SystemUI/res/layout/fgs_manager_app_item.xml
+++ b/packages/SystemUI/res/layout/fgs_manager_app_item.xml
@@ -26,7 +26,7 @@
       android:id="@+id/fgs_manager_app_item_icon"
       android:layout_width="28dp"
       android:layout_height="28dp"
-      android:layout_marginRight="12dp" />
+      android:layout_marginEnd="12dp" />
 
   <LinearLayout
       android:layout_width="0dp"
@@ -38,7 +38,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="start"
-        style="@style/TextAppearance.Dialog.Body" />
+        style="@style/FgsManagerAppLabel" />
     <TextView
         android:id="@+id/fgs_manager_app_item_duration"
         android:layout_width="match_parent"
@@ -52,6 +52,6 @@
       android:layout_width="wrap_content"
       android:layout_height="48dp"
       android:text="@string/fgs_manager_app_item_stop_button_label"
-      android:layout_marginLeft="12dp"
+      android:layout_marginStart="12dp"
       style="?android:attr/buttonBarNeutralButtonStyle" />
 </LinearLayout>
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index ee77d210add5c..5cfe29f6ce133 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -1077,6 +1077,10 @@
         <item name="android:textDirection">locale</item>
     </style>
 
+    <style name="FgsManagerAppLabel" parent="TextAppearance.Dialog.Body">
+        <item name="android:textDirection">locale</item>
+    </style>
+
     <style name="FgsManagerAppDuration">
         <item name="android:fontFamily">?android:attr/textAppearanceSmall</item>
         <item name="android:textDirection">locale</item>