From ecc3027c954a7f06550b3c6eb868cd9f7347d5be Mon Sep 17 00:00:00 2001
From: Pat Manning <patmanning@google.com>
Date: Wed, 15 Mar 2023 16:03:00 +0000
Subject: [PATCH] Add automirroring to kids mode back button.

Fix: 270629022
Test: manual.
Change-Id: I51957074c0278253a15e0efe9b2b2bcaa8105c4f
---
 quickstep/res/drawable/ic_sysbar_back_kids.xml                   | 1 +
 .../android/launcher3/taskbar/NavbarButtonsViewController.java   | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstep/res/drawable/ic_sysbar_back_kids.xml b/quickstep/res/drawable/ic_sysbar_back_kids.xml
index ac6d49b7f3..e7bba671e8 100644
--- a/quickstep/res/drawable/ic_sysbar_back_kids.xml
+++ b/quickstep/res/drawable/ic_sysbar_back_kids.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:autoMirrored="true"
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
diff --git a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java
index 84bf02ec28..b1048a6f3c 100644
--- a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java
@@ -755,7 +755,6 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT
             mBackButton.setImageDrawable(rotateDrawable);
             mBackButton.setScaleType(ImageView.ScaleType.FIT_CENTER);
             mBackButton.setPadding(paddingleft, paddingTop, paddingRight, paddingBottom);
-            mBackButton.setScaleX(Utilities.isRtl(mContext.getResources()) ? -1f : 1f);
 
             mHomeButton.setImageDrawable(
                     mHomeButton.getContext().getDrawable(R.drawable.ic_sysbar_home_kids));