From 1ab8da20f529dfc1eaa760167319ad097e28e1d8 Mon Sep 17 00:00:00 2001 From: Jagrut Desai Date: Fri, 10 Nov 2023 09:40:20 -0800 Subject: [PATCH] Fix RTL issue with all apps meta icon Test: Presubmit, Manual Bug: 309453796 Flag: NONE Change-Id: I5d8bda2c48a0815d7005a0727f67f871f75d4f0f --- quickstep/src/com/android/launcher3/taskbar/TaskbarView.java | 1 - .../com/android/launcher3/taskbar/TaskbarViewController.java | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java index a7461b738f..48dfd6943a 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java @@ -155,7 +155,6 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar .inflate(R.layout.taskbar_all_apps_button, this, false); mAllAppsButton.setIconDrawable(resources.getDrawable( getAllAppsButton(isTransientTaskbar))); - mAllAppsButton.setScaleX(mIsRtl ? -1 : 1); mAllAppsButton.setPadding(mItemPadding, mItemPadding, mItemPadding, mItemPadding); mAllAppsButton.setForegroundTint( mActivityContext.getColor(R.color.all_apps_button_color)); diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java index 8f43a2f5b6..af6c810651 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java @@ -367,6 +367,10 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar float allAppIconTranslateRange = mapRange(scale, transientTaskbarAllAppsOffset, persistentTaskbarAllAppsOffset); + if (mIsRtl) { + allAppIconTranslateRange *= -1; + } + float halfIconCount = iconViews.length / 2.0f; for (int iconIndex = 0; iconIndex < iconViews.length; iconIndex++) { View iconView = iconViews[iconIndex];