From 9b2b607a0942cabf712d4406f01c4086ac88490e Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Sat, 12 Feb 2022 19:23:23 +0000 Subject: [PATCH] Fix taskbar hotseat alignment - Use hotseatBorderSpace instead of cellLayoutBorderSpace - Also divide by 2f instead of 2 because AS was complaining. May or may not potentially address off by 1 pixel issues. Test: locally set alignment = 1, ensure perfectly aligned Fixes: 218880076 Change-Id: Ifec30e6727f62985427b65b6c0b0810e7f7cd695 --- .../android/launcher3/taskbar/TaskbarViewController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java index 778040dbc1..84367fa4ae 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java @@ -211,7 +211,7 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar PendingAnimation setter = new PendingAnimation(100); Rect hotseatPadding = launcherDp.getHotseatLayoutPadding(mActivity); float scaleUp = ((float) launcherDp.iconSizePx) / mActivity.getDeviceProfile().iconSizePx; - int borderSpacing = launcherDp.cellLayoutBorderSpacePx.x; + int borderSpacing = launcherDp.hotseatBorderSpace; int hotseatCellSize = DeviceProfile.calculateCellWidth( launcherDp.availableWidthPx - hotseatPadding.left - hotseatPadding.right, borderSpacing, @@ -247,9 +247,9 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar float hotseatIconCenter = hotseatPadding.left + (hotseatCellSize + borderSpacing) * positionInHotseat - + hotseatCellSize / 2; + + hotseatCellSize / 2f; - float childCenter = (child.getLeft() + child.getRight()) / 2; + float childCenter = (child.getLeft() + child.getRight()) / 2f; setter.setFloat(child, ICON_TRANSLATE_X, hotseatIconCenter - childCenter, LINEAR); setter.setFloat(child, SCALE_PROPERTY, scaleUp, LINEAR);