From b214bd0cb1841f70e40e838f70e0f8291b6c5c9c Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Thu, 9 Apr 2020 17:55:39 -0700 Subject: [PATCH] Revert regression where we no longer reverse translation for RTL Change-Id: I6de15c983eaf7ece244f2b2ba7e9f9c80bdab92b --- .../BaseRecentsViewStateController.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java index 123c988a04..0f45196ec4 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java @@ -62,10 +62,13 @@ public abstract class BaseRecentsViewStateController @Override public void setState(@NonNull LauncherState state) { - ScaleAndTranslation scaleAndTranslation = state - .getOverviewScaleAndTranslation(mLauncher); + ScaleAndTranslation scaleAndTranslation = state.getOverviewScaleAndTranslation(mLauncher); + float translationX = scaleAndTranslation.translationX; + if (mRecentsView.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) { + translationX = -translationX; + } SCALE_PROPERTY.set(mRecentsView, scaleAndTranslation.scale); - mRecentsView.setTranslationX(scaleAndTranslation.translationX); + mRecentsView.setTranslationX(translationX); mRecentsView.setTranslationY(scaleAndTranslation.translationY); getContentAlphaProperty().set(mRecentsView, state.overviewUi ? 1f : 0); @@ -96,9 +99,13 @@ public abstract class BaseRecentsViewStateController void setStateWithAnimationInternal(@NonNull final LauncherState toState, @NonNull StateAnimationConfig config, @NonNull PendingAnimation setter) { ScaleAndTranslation scaleAndTranslation = toState.getOverviewScaleAndTranslation(mLauncher); + float translationX = scaleAndTranslation.translationX; + if (mRecentsView.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) { + translationX = -translationX; + } setter.setFloat(mRecentsView, SCALE_PROPERTY, scaleAndTranslation.scale, config.getInterpolator(ANIM_OVERVIEW_SCALE, LINEAR)); - setter.setFloat(mRecentsView, VIEW_TRANSLATE_X, scaleAndTranslation.translationX, + setter.setFloat(mRecentsView, VIEW_TRANSLATE_X, translationX, config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_X, LINEAR)); setter.setFloat(mRecentsView, VIEW_TRANSLATE_Y, scaleAndTranslation.translationY, config.getInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, LINEAR));