diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index 91fa4ca497..96e0913a03 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -998,7 +998,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 @@ -1007,7 +1007,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 d7cdb8f283..9c749aa790 100644 --- a/src/com/android/launcher3/Hotseat.java +++ b/src/com/android/launcher3/Hotseat.java @@ -111,10 +111,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());