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

Commit 5c8249b7 authored by Abhishek Aggarwal's avatar Abhishek Aggarwal Committed by Sahil Sonar
Browse files

fix: Apply center vertical padding to folders as well 



[SahilSonar - adapted to A14]

Signed-off-by: default avatarSahilSonar <sss.sonar2003@gmail.com>
parent edaae3f2

src/com/android/launcher3/BubbleTextView.java

+2 −1
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ import com.android.launcher3.icons.FastBitmapDrawable; 
import com.android.launcher3.icons.IconCache.ItemInfoUpdateReceiver;

import com.android.launcher3.icons.PlaceHolderIconDrawable;

import com.android.launcher3.model.data.AppInfo;

import com.android.launcher3.model.data.FolderInfo;

import com.android.launcher3.model.data.ItemInfo;

import com.android.launcher3.model.data.ItemInfoWithIcon;

import com.android.launcher3.model.data.WorkspaceItemInfo;
@@ -862,7 +863,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver, 
    @Override

    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {

        int height = MeasureSpec.getSize(heightMeasureSpec);

        if (mCenterVertically) {

        if (mCenterVertically && (getTag() != null && !(getTag() instanceof FolderInfo))) {

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

            int cellHeightPx = mIconSize + getCompoundDrawablePadding() +

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

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

+6 −7
Original line number Diff line number Diff line
@@ -657,14 +657,13 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel 


    @Override

    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {

        boolean shouldCenterIcon = mActivity.getDeviceProfile().iconCenterVertically;

        if (shouldCenterIcon) {

            int iconSize = mActivity.getDeviceProfile().iconSizePx;

        if (MultiModeController.isSingleLayerMode()) {

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

            int cellHeightPx = iconSize + mFolderName.getCompoundDrawablePadding()

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

            setPadding(getPaddingLeft(), (MeasureSpec.getSize(heightMeasureSpec)

                    - cellHeightPx) / 2, getPaddingRight(), getPaddingBottom());

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

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

            int height = MeasureSpec.getSize(heightMeasureSpec);

            setPadding(getPaddingLeft(), (height - cellHeightPx) / 2, getPaddingRight(),

                    getPaddingBottom());

        }

        super.onMeasure(widthMeasureSpec, heightMeasureSpec);

    }