From 7d149231957467a5cc8b8b889047a4340e4b0518 Mon Sep 17 00:00:00 2001 From: Thales Lima Date: Mon, 21 Mar 2022 18:27:45 +0000 Subject: [PATCH] Fix height of hotseat Hotseat size was going behind workspace unnecessarily, causing some issues and also had the wrong hotseat height which was cutting the icons in folders. Fixes: 224713923 Fixes: 221101290 Test: manual Change-Id: I2646abc4a6aaa5bf2ea85e55e2f3618f8d7efd9b --- src/com/android/launcher3/DeviceProfile.java | 4 ++-- src/com/android/launcher3/Hotseat.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index 622d750c83..f9d5a5828d 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -947,7 +947,7 @@ public class DeviceProfile { additionalLeftSpace = qsbWidth + hotseatBorderSpace; } - int hotseatTopDiff = hotseatHeight - taskbarOffset; + int hotseatTopPadding = hotseatHeight - taskbarOffset - hotseatCellHeightPx; int endOffset = ApiWrapper.getHotseatEndOffset(context); int requiredWidth = iconSizePx * numShownHotseatIcons @@ -956,7 +956,7 @@ public class DeviceProfile { int hotseatSize = Math.min(requiredWidth, availableWidthPx - endOffset); int sideSpacing = (availableWidthPx - hotseatSize) / 2; - mHotseatPadding.set(sideSpacing + additionalLeftSpace, hotseatTopDiff, sideSpacing, + mHotseatPadding.set(sideSpacing + additionalLeftSpace, hotseatTopPadding, sideSpacing, taskbarOffset); if (endOffset > sideSpacing) { diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java index e1680fc7e7..b0e938a6ed 100644 --- a/src/com/android/launcher3/Hotseat.java +++ b/src/com/android/launcher3/Hotseat.java @@ -110,10 +110,9 @@ public class Hotseat extends CellLayout implements Insettable { mQsb.setVisibility(View.VISIBLE); lp.gravity = Gravity.BOTTOM; lp.width = ViewGroup.LayoutParams.MATCH_PARENT; - lp.height = (grid.isTaskbarPresent + lp.height = grid.isTaskbarPresent ? grid.workspacePadding.bottom - : grid.hotseatBarSizePx) - + (grid.isTaskbarPresent ? grid.taskbarSize : insets.bottom); + : grid.hotseatBarSizePx + insets.bottom; } Rect padding = grid.getHotseatLayoutPadding(getContext());