diff options
Diffstat (limited to 'src/com/android/launcher3/DeviceProfile.java')
| -rw-r--r-- | src/com/android/launcher3/DeviceProfile.java | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index 7919d2935..6397e14ac 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -16,8 +16,6 @@ package com.android.launcher3; -import android.appwidget.AppWidgetHostView; -import android.content.ComponentName; import android.content.Context; import android.content.res.Configuration; import android.content.res.Resources; @@ -70,9 +68,6 @@ public class DeviceProfile { public final int cellLayoutPaddingLeftRightPx; public final int cellLayoutBottomPaddingPx; public final int edgeMarginPx; - public final Rect defaultWidgetPadding; - public final int defaultPageSpacingPx; - private final int topWorkspacePadding; public float workspaceSpringLoadShrinkFactor; public final int workspaceSpringLoadedBottomSpace; @@ -177,26 +172,25 @@ public class DeviceProfile { : Configuration.ORIENTATION_PORTRAIT); res = context.getResources(); - - ComponentName cn = new ComponentName(context.getPackageName(), - this.getClass().getName()); - defaultWidgetPadding = AppWidgetHostView.getDefaultPaddingForWidget(context, cn, null); edgeMarginPx = res.getDimensionPixelSize(R.dimen.dynamic_grid_edge_margin); desiredWorkspaceLeftRightMarginPx = isVerticalBarLayout() ? 0 : edgeMarginPx; + int cellLayoutPaddingLeftRightMultiplier = !isVerticalBarLayout() && isTablet ? PORTRAIT_TABLET_LEFT_RIGHT_PADDING_MULTIPLIER : 1; - cellLayoutPaddingLeftRightPx = cellLayoutPaddingLeftRightMultiplier * - res.getDimensionPixelSize(R.dimen.dynamic_grid_cell_layout_padding); - cellLayoutBottomPaddingPx = - res.getDimensionPixelSize(R.dimen.dynamic_grid_cell_layout_bottom_padding); + int cellLayoutPadding = res.getDimensionPixelSize(R.dimen.dynamic_grid_cell_layout_padding); + if (isLandscape) { + cellLayoutPaddingLeftRightPx = 0; + cellLayoutBottomPaddingPx = cellLayoutPadding; + } else { + cellLayoutPaddingLeftRightPx = cellLayoutPaddingLeftRightMultiplier * cellLayoutPadding; + cellLayoutBottomPaddingPx = 0; + } + verticalDragHandleSizePx = res.getDimensionPixelSize( R.dimen.vertical_drag_handle_size); verticalDragHandleOverlapWorkspace = res.getDimensionPixelSize(R.dimen.vertical_drag_handle_overlap_workspace); - defaultPageSpacingPx = - res.getDimensionPixelSize(R.dimen.dynamic_grid_workspace_page_spacing); - topWorkspacePadding = - res.getDimensionPixelSize(R.dimen.dynamic_grid_workspace_top_padding); + iconDrawablePaddingOriginalPx = res.getDimensionPixelSize(R.dimen.dynamic_grid_icon_drawable_padding); dropTargetBarSizePx = res.getDimensionPixelSize(R.dimen.dynamic_grid_drop_target_size); @@ -360,7 +354,7 @@ public class DeviceProfile { if (!isVerticalLayout) { int expectedWorkspaceHeight = availableHeightPx - hotseatBarSizePx - - verticalDragHandleSizePx - topWorkspacePadding; + - verticalDragHandleSizePx - edgeMarginPx; float minRequiredHeight = dropTargetBarSizePx + workspaceSpringLoadedBottomSpace; workspaceSpringLoadShrinkFactor = Math.min( res.getInteger(R.integer.config_workspaceSpringLoadShrinkPercentage) / 100.0f, @@ -471,15 +465,15 @@ public class DeviceProfile { ((inv.numColumns - 1) * cellWidthPx))); availablePaddingX = (int) Math.min(availablePaddingX, widthPx * MAX_HORIZONTAL_PADDING_PERCENT); - int availablePaddingY = Math.max(0, heightPx - topWorkspacePadding - paddingBottom + int availablePaddingY = Math.max(0, heightPx - edgeMarginPx - paddingBottom - (2 * inv.numRows * cellHeightPx) - hotseatBarTopPaddingPx - hotseatBarBottomPaddingPx); - padding.set(availablePaddingX / 2, topWorkspacePadding + availablePaddingY / 2, + padding.set(availablePaddingX / 2, edgeMarginPx + availablePaddingY / 2, availablePaddingX / 2, paddingBottom + availablePaddingY / 2); } else { // Pad the top and bottom of the workspace with search/hotseat bar sizes padding.set(desiredWorkspaceLeftRightMarginPx, - topWorkspacePadding, + edgeMarginPx, desiredWorkspaceLeftRightMarginPx, paddingBottom); } |