Merge "Update extra space allocations for taller devices." into sc-dev am: dd16ecbc61

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15457550 Change-Id: Ie6c7f0b80eaef11d315ffe3cef9ddb6964a7eb93
2021-08-05 18:41:57 +00:00
parent b688e02643 dd16ecbc61
commit 2bf9863aa4
1 changed files with 5 additions and 4 deletions
@@ -386,14 +386,15 @@ public class DeviceProfile {

                // For devices with more extra space, we take a larger piece from each cell.
                int piece = extraSpace < Utilities.dpToPx(TALL_DEVICE_MORE_EXTRA_SPACE_THRESHOLD_DP)
-                        ? 5 : 3;
+                        ? 7 : 5;

                int extraSpace = ((getCellSize().y - iconSizePx - iconDrawablePaddingPx * 2)
                        * inv.numRows) / piece;

-                int halfExtraSpace = extraSpace / 2;
-                hotseatBarTopPaddingPx += halfExtraSpace;
-                hotseatBarSizeExtraSpacePx = halfExtraSpace;
+                workspaceTopPadding = extraSpace / 8;
+                int halfLeftOver = (extraSpace - workspaceTopPadding) / 2;
+                hotseatBarTopPaddingPx += halfLeftOver;
+                hotseatBarSizeExtraSpacePx = halfLeftOver;
            } else {
                // ie. For a display with a large aspect ratio, we can keep the icons on the
                // workspace in portrait mode closer together by adding more height to the hotseat.