Merge "Align taskbar children to Y value instead of X." into tm-qpr-dev am: 7fa1e32f21 am: 8c61868b40

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

Change-Id: Ie6743e057e216710988f45c7e2b5d3e2cff10408
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tony Wickham
2023-03-07 21:14:10 +00:00
committed by Automerger Merge Worker
@@ -349,7 +349,7 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar
MULTI_PROPERTY_VALUE, isStashed
? new float[] {croppedTransX}
: new float[] {croppedTransX, 0}));
as.play(ObjectAnimator.ofFloat(mtd.getTranslationX(INDEX_TASKBAR_REVEAL_ANIM),
as.play(ObjectAnimator.ofFloat(mtd.getTranslationY(INDEX_TASKBAR_REVEAL_ANIM),
MULTI_PROPERTY_VALUE, isStashed
? new float[] {croppedTransY}
: new float[] {croppedTransY, 0}));
@@ -503,7 +503,7 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar
setter.setFloat(mtd.getTranslationX(INDEX_TASKBAR_ALIGNMENT_ANIM),
MULTI_PROPERTY_VALUE, hotseatIconCenter - childCenter, interpolator);
setter.setFloat(mtd.getTranslationX(INDEX_TASKBAR_ALIGNMENT_ANIM),
setter.setFloat(mtd.getTranslationY(INDEX_TASKBAR_ALIGNMENT_ANIM),
MULTI_PROPERTY_VALUE, mTaskbarBottomMargin, interpolator);
} else {
setter.setFloat(child, VIEW_TRANSLATE_X,