Merge "Treat RTL split placeholder animation same as LTR" into sc-v2-dev am: b15d3cfe73

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16368980

Change-Id: Ide9e4d8c581e249a54b07c88374a0a7e3d6a78fb
This commit is contained in:
Vinit Nayak
2021-12-01 16:22:07 +00:00
committed by Automerger Merge Worker
@@ -129,9 +129,7 @@ public class FloatingTaskView extends FrameLayout {
public void update(RectF position, float progress, float windowRadius) {
MarginLayoutParams lp = (MarginLayoutParams) getLayoutParams();
float dX = mIsRtl
? position.left - (lp.getMarginStart() - lp.width)
: position.left - lp.getMarginStart();
float dX = position.left - lp.getMarginStart();
float dY = position.top - lp.topMargin;
setTranslationX(dX);
@@ -157,16 +155,10 @@ public class FloatingTaskView extends FrameLayout {
lp.ignoreInsets = true;
// Position the floating view exactly on top of the original
lp.topMargin = Math.round(pos.top);
if (mIsRtl) {
lp.setMarginStart(Math.round(mLauncher.getDeviceProfile().widthPx - pos.right));
} else {
lp.setMarginStart(Math.round(pos.left));
}
lp.setMarginStart(Math.round(pos.left));
// Set the properties here already to make sure they are available when running the first
// animation frame.
int left = mIsRtl
? mLauncher.getDeviceProfile().widthPx - lp.getMarginStart() - lp.width
: lp.leftMargin;
int left = lp.leftMargin;
layout(left, lp.topMargin, left + lp.width, lp.topMargin + lp.height);
}