Loading src/com/android/launcher3/DeviceProfile.java +7 −5 Original line number Diff line number Diff line Loading @@ -1818,7 +1818,11 @@ public class DeviceProfile { */ public Rect getHotseatLayoutPadding(Context context) { // Make sure to update all relevant sizes for cutout and orientation updateHotseatSizes(pxFromDp(inv.iconSize[mTypeIndex], mMetrics)); int hotseatIconSizePx = pxFromDp(inv.iconSize[mTypeIndex], mMetrics); if (!isTaskbarPresent && isNoHintGesture) { hotseatIconSizePx = (int) (hotseatIconSizePx / 1.2f); } updateHotseatSizes(hotseatIconSizePx); Rect hotseatBarPadding = new Rect(); boolean isFullyGesture = isGestural(); if (isVerticalBarLayout()) { Loading Loading @@ -1885,9 +1889,7 @@ public class DeviceProfile { int hotseatAdjustment = Math.round((workspaceCellWidth - hotseatCellWidth) / 2); int hotseatIconMargin = Math.abs(hotseatCellHeightPx - iconSizePx); // Values obtained by manual validation, independent of dpi and display scale double marginScaleFactor = isFullyGesture ? (isNoHintGesture ? 2.5 : 3.25) : 2.75; double marginScaleFactor = isFullyGesture ? 3.25 : 2.75; hotseatBarPadding.set( hotseatAdjustment + workspacePadding.left + cellLayoutPaddingPx.left + mInsets.left, Loading Loading @@ -1979,7 +1981,7 @@ public class DeviceProfile { } } else { if (isNoHintGesture) { return Math.abs(hotseatBarSizePx - iconSizePx) / 2; return (int) (Math.abs(hotseatBarSizePx - iconSizePx) / 2.2f); } return hotseatBarBottomSpacePx + (int) ((isGestural() ? .75f : 2f) * heightDifference); Loading Loading
src/com/android/launcher3/DeviceProfile.java +7 −5 Original line number Diff line number Diff line Loading @@ -1818,7 +1818,11 @@ public class DeviceProfile { */ public Rect getHotseatLayoutPadding(Context context) { // Make sure to update all relevant sizes for cutout and orientation updateHotseatSizes(pxFromDp(inv.iconSize[mTypeIndex], mMetrics)); int hotseatIconSizePx = pxFromDp(inv.iconSize[mTypeIndex], mMetrics); if (!isTaskbarPresent && isNoHintGesture) { hotseatIconSizePx = (int) (hotseatIconSizePx / 1.2f); } updateHotseatSizes(hotseatIconSizePx); Rect hotseatBarPadding = new Rect(); boolean isFullyGesture = isGestural(); if (isVerticalBarLayout()) { Loading Loading @@ -1885,9 +1889,7 @@ public class DeviceProfile { int hotseatAdjustment = Math.round((workspaceCellWidth - hotseatCellWidth) / 2); int hotseatIconMargin = Math.abs(hotseatCellHeightPx - iconSizePx); // Values obtained by manual validation, independent of dpi and display scale double marginScaleFactor = isFullyGesture ? (isNoHintGesture ? 2.5 : 3.25) : 2.75; double marginScaleFactor = isFullyGesture ? 3.25 : 2.75; hotseatBarPadding.set( hotseatAdjustment + workspacePadding.left + cellLayoutPaddingPx.left + mInsets.left, Loading Loading @@ -1979,7 +1981,7 @@ public class DeviceProfile { } } else { if (isNoHintGesture) { return Math.abs(hotseatBarSizePx - iconSizePx) / 2; return (int) (Math.abs(hotseatBarSizePx - iconSizePx) / 2.2f); } return hotseatBarBottomSpacePx + (int) ((isGestural() ? .75f : 2f) * heightDifference); Loading