Loading src/com/android/launcher3/folder/FolderIcon.java +7 −7 Original line number Original line Diff line number Diff line Loading @@ -215,14 +215,14 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) icon.mFolderName.getLayoutParams(); FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) icon.mFolderName.getLayoutParams(); if (MultiModeController.isSingleLayerMode()) { if (MultiModeController.isSingleLayerMode()) { Paint.FontMetrics fm = icon.mFolderName.getPaint().getFontMetrics(); lp.topMargin = grid.folderIconSizePx + (grid.folderIconOffsetYPx * 2); int cellHeightPx = icon.mFolderName.getIconSize() + icon.mFolderName.getCompoundDrawablePadding() + if (lp.topMargin < grid.getCellSize().x) { (int) Math.ceil(fm.bottom - fm.top); lp.topMargin = grid.iconSizePx + (grid.getCellSize().y - cellHeightPx) / 2; icon.mFolderName.setIncludeFontPadding(false); icon.mFolderName.setIncludeFontPadding(false); } else { } else { lp.topMargin = grid.iconSizePx + grid.iconDrawablePaddingPx; lp.topMargin = grid.folderIconSizePx + grid.folderIconOffsetYPx; } } else { lp.topMargin = grid.folderIconSizePx + grid.iconDrawablePaddingPx; } } icon.setTag(folderInfo); icon.setTag(folderInfo); Loading Loading
src/com/android/launcher3/folder/FolderIcon.java +7 −7 Original line number Original line Diff line number Diff line Loading @@ -215,14 +215,14 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) icon.mFolderName.getLayoutParams(); FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) icon.mFolderName.getLayoutParams(); if (MultiModeController.isSingleLayerMode()) { if (MultiModeController.isSingleLayerMode()) { Paint.FontMetrics fm = icon.mFolderName.getPaint().getFontMetrics(); lp.topMargin = grid.folderIconSizePx + (grid.folderIconOffsetYPx * 2); int cellHeightPx = icon.mFolderName.getIconSize() + icon.mFolderName.getCompoundDrawablePadding() + if (lp.topMargin < grid.getCellSize().x) { (int) Math.ceil(fm.bottom - fm.top); lp.topMargin = grid.iconSizePx + (grid.getCellSize().y - cellHeightPx) / 2; icon.mFolderName.setIncludeFontPadding(false); icon.mFolderName.setIncludeFontPadding(false); } else { } else { lp.topMargin = grid.iconSizePx + grid.iconDrawablePaddingPx; lp.topMargin = grid.folderIconSizePx + grid.folderIconOffsetYPx; } } else { lp.topMargin = grid.folderIconSizePx + grid.iconDrawablePaddingPx; } } icon.setTag(folderInfo); icon.setTag(folderInfo); Loading