Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e014334 authored by Abhishek Aggarwal's avatar Abhishek Aggarwal
Browse files

fix(folder): Have equal size folder

parent 474ecb15

src/com/android/launcher3/DeviceProfile.java

+3 −1
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import androidx.core.content.res.ResourcesCompat; 
import com.android.launcher3.CellLayout.ContainerType;

import com.android.launcher3.DevicePaddings.DevicePadding;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.graphics.IconShape;

import com.android.launcher3.icons.DotRenderer;

import com.android.launcher3.icons.IconNormalizer;

import com.android.launcher3.model.data.ItemInfo;
@@ -1021,7 +1022,8 @@ public class DeviceProfile { 
        updateHotseatSizes(iconSizePx);



        // Folder icon

        folderIconSizePx = IconNormalizer.getNormalizedCircleSize(iconSizePx - iconDrawablePaddingPx);

        int visibleIcon = (int) Math.ceil(iconSizePx * IconShape.getNormalizationScale());

        folderIconSizePx = visibleIcon;

        folderIconOffsetYPx = (iconSizePx - folderIconSizePx) / 2;

    }

src/com/android/launcher3/folder/FolderIcon.java

+5 −1
Original line number Diff line number Diff line
@@ -217,7 +217,11 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel 
        FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) icon.mFolderName.getLayoutParams();



        if (MultiModeController.isSingleLayerMode()) {

            lp.topMargin = grid.iconSizePx;

            Paint.FontMetrics fm = icon.mFolderName.getPaint().getFontMetrics();

            int cellHeightPx = icon.mFolderName.getIconSize() + icon.mFolderName.getCompoundDrawablePadding() +

                    (int) Math.ceil(fm.bottom - fm.top);



            lp.topMargin = grid.iconSizePx + (grid.getCellSize().y - cellHeightPx) / 2;

            icon.mFolderName.setIncludeFontPadding(false);

        } else {

            lp.topMargin = grid.iconSizePx + grid.iconDrawablePaddingPx;