From baec6ffae2c260180dbdf2c6b2ca2f38e1df8f1a Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Wed, 14 Sep 2016 11:26:21 -0700 Subject: Updating the paddings in folder cell > Updating overall padding for the cell and adding drawable padding > Ensuring that the folder cell is always rendered properly based on available vertical space Bug: 30605958 Change-Id: I8ceb9fea5a25052b0d7461f52edca0e6a33fa085 --- src/com/android/launcher3/BubbleTextView.java | 4 +++- src/com/android/launcher3/DeviceProfile.java | 34 ++++++++++++++++----------- src/com/android/launcher3/Utilities.java | 4 ++-- 3 files changed, 25 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java index 33b3ad347..a294fa538 100644 --- a/src/com/android/launcher3/BubbleTextView.java +++ b/src/com/android/launcher3/BubbleTextView.java @@ -65,6 +65,7 @@ public class BubbleTextView extends TextView private static final int DISPLAY_WORKSPACE = 0; private static final int DISPLAY_ALL_APPS = 1; + private static final int DISPLAY_FOLDER = 2; private final Launcher mLauncher; private Drawable mIcon; @@ -125,12 +126,13 @@ public class BubbleTextView extends TextView setTextSize(TypedValue.COMPLEX_UNIT_PX, grid.allAppsIconTextSizePx); setCompoundDrawablePadding(grid.allAppsIconDrawablePaddingPx); defaultIconSize = grid.allAppsIconSizePx; + } else if (display == DISPLAY_FOLDER) { + setCompoundDrawablePadding(grid.folderChildDrawablePaddingPx); } mCenterVertically = a.getBoolean(R.styleable.BubbleTextView_centerVertically, false); mIconSize = a.getDimensionPixelSize(R.styleable.BubbleTextView_iconSizeOverride, defaultIconSize); - a.recycle(); if (mCustomShadowsEnabled) { diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index c9fd85a16..c4e6ed119 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -20,8 +20,6 @@ import android.appwidget.AppWidgetHostView; import android.content.ComponentName; import android.content.Context; import android.content.res.Resources; -import android.graphics.Paint; -import android.graphics.Paint.FontMetrics; import android.graphics.Point; import android.graphics.Rect; import android.util.DisplayMetrics; @@ -100,6 +98,7 @@ public class DeviceProfile { public int folderIconPreviewPadding; public int folderCellWidthPx; public int folderCellHeightPx; + public int folderChildDrawablePaddingPx; // Hotseat public int hotseatCellWidthPx; @@ -255,12 +254,9 @@ public class DeviceProfile { allAppsIconDrawablePaddingPx = iconDrawablePaddingPx; allAppsIconTextSizePx = iconTextSizePx; - // Calculate the actual text height - Paint textPaint = new Paint(); - textPaint.setTextSize(iconTextSizePx); - FontMetrics fm = textPaint.getFontMetrics(); cellWidthPx = iconSizePx; - cellHeightPx = iconSizePx + iconDrawablePaddingPx + (int) Math.ceil(fm.bottom - fm.top); + cellHeightPx = iconSizePx + iconDrawablePaddingPx + + Utilities.calculateTextHeight(iconTextSizePx); final float scaleDps = !FeatureFlags.LAUNCHER3_LEGACY_WORKSPACE_DND ? 0f : res.getDimensionPixelSize(R.dimen.dragViewScale); dragViewScale = (iconSizePx + scaleDps) / iconSizePx; @@ -281,12 +277,25 @@ public class DeviceProfile { res.getInteger(R.integer.config_workspaceSpringLoadShrinkPercentage) / 100.0f; } - // Folder - int folderCellPadding = isTablet || isLandscape ? 6 * edgeMarginPx : 3 * edgeMarginPx; + // Folder cell + int cellPaddingX = res.getDimensionPixelSize(R.dimen.folder_cell_x_padding); + int cellPaddingY = res.getDimensionPixelSize(R.dimen.folder_cell_y_padding); + final int folderChildTextSize = + Utilities.calculateTextHeight(res.getDimension(R.dimen.folder_child_text_size)); + + final int folderBottomPanelSize = + 2 * res.getDimensionPixelSize(R.dimen.folder_label_padding) + + Utilities.calculateTextHeight(res.getDimension(R.dimen.folder_label_text_size)); + // Don't let the folder get too close to the edges of the screen. - folderCellWidthPx = Math.min(cellWidthPx + folderCellPadding, + folderCellWidthPx = Math.min(iconSizePx + 2 * cellPaddingX, (availableWidthPx - 4 * edgeMarginPx) / inv.numFolderColumns); - folderCellHeightPx = cellHeightPx + edgeMarginPx; + folderCellHeightPx = Math.min(iconSizePx + 3 * cellPaddingY + folderChildTextSize, + (availableHeightPx - 4 * edgeMarginPx - folderBottomPanelSize) / inv.numFolderRows); + folderChildDrawablePaddingPx = Math.max(0, + (folderCellHeightPx - iconSizePx - folderChildTextSize) / 3); + + // Folder icon folderBackgroundOffset = -edgeMarginPx; folderIconSizePx = iconSizePx + 2 * -folderBackgroundOffset; folderIconPreviewPadding = res.getDimensionPixelSize(R.dimen.folder_preview_padding); @@ -296,9 +305,6 @@ public class DeviceProfile { mInsets.set(insets); } - /** - * @param recyclerViewWidth the available width of the AllAppsRecyclerView - */ public void updateAppsViewNumCols() { allAppsNumCols = allAppsNumPredictiveCols = inv.numColumns; } diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java index e34f509da..b0e096a2e 100644 --- a/src/com/android/launcher3/Utilities.java +++ b/src/com/android/launcher3/Utilities.java @@ -686,11 +686,11 @@ public final class Utilities { /** * Calculates the height of a given string at a specific text size. */ - public static float calculateTextHeight(float textSizePx) { + public static int calculateTextHeight(float textSizePx) { Paint p = new Paint(); p.setTextSize(textSizePx); Paint.FontMetrics fm = p.getFontMetrics(); - return -fm.top + fm.bottom; + return (int) Math.ceil(fm.bottom - fm.top); } /** -- cgit v1.2.3