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

Commit af3aed0c authored by Jon Miranda's avatar Jon Miranda
Browse files

Use SP for folder text size. 

Bug: 156141463
Test: change font size, verify folder text size changes
Change-Id: I7e479d76c9f16c5b42cabfbae63494ef98b6dc27
parent d30f4ce5

src/com/android/launcher3/DeviceProfile.java

+4 −3
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION; 




import static com.android.launcher3.ResourceUtils.pxFromDp;

import static com.android.launcher3.ResourceUtils.pxFromDp;

import static com.android.launcher3.Utilities.dpiFromPx;

import static com.android.launcher3.Utilities.dpiFromPx;

import static com.android.launcher3.Utilities.pxFromSp;

import static com.android.launcher3.util.WindowManagerCompat.MIN_TABLET_WIDTH;

import static com.android.launcher3.util.WindowManagerCompat.MIN_TABLET_WIDTH;





import android.annotation.SuppressLint;

import android.annotation.SuppressLint;
@@ -518,7 +519,7 @@ public class DeviceProfile { 
        float invIconSizeDp = isLandscape ? inv.landscapeIconSize : inv.iconSize;

        float invIconSizeDp = isLandscape ? inv.landscapeIconSize : inv.iconSize;

        iconSizePx = Math.max(1, pxFromDp(invIconSizeDp, mMetrics, scale));

        iconSizePx = Math.max(1, pxFromDp(invIconSizeDp, mMetrics, scale));

        float invIconTextSizeSp = isLandscape ? inv.landscapeIconTextSize : inv.iconTextSize;

        float invIconTextSizeSp = isLandscape ? inv.landscapeIconTextSize : inv.iconTextSize;

        iconTextSizePx = (int) (Utilities.pxFromSp(invIconTextSizeSp, mMetrics) * scale);

        iconTextSizePx = (int) (pxFromSp(invIconTextSizeSp, mMetrics) * scale);

        iconDrawablePaddingPx = (int) (iconDrawablePaddingOriginalPx * scale);

        iconDrawablePaddingPx = (int) (iconDrawablePaddingOriginalPx * scale);





        setCellLayoutBorderSpacing((int) (cellLayoutBorderSpacingOriginalPx * scale));

        setCellLayoutBorderSpacing((int) (cellLayoutBorderSpacingOriginalPx * scale));
@@ -548,7 +549,7 @@ public class DeviceProfile { 
        // All apps

        // All apps

        if (numShownAllAppsColumns != inv.numColumns) {

        if (numShownAllAppsColumns != inv.numColumns) {

            allAppsIconSizePx = pxFromDp(inv.allAppsIconSize, mMetrics);

            allAppsIconSizePx = pxFromDp(inv.allAppsIconSize, mMetrics);

            allAppsIconTextSizePx = Utilities.pxFromSp(inv.allAppsIconTextSize, mMetrics);

            allAppsIconTextSizePx = pxFromSp(inv.allAppsIconTextSize, mMetrics);

            allAppsIconDrawablePaddingPx = iconDrawablePaddingOriginalPx;

            allAppsIconDrawablePaddingPx = iconDrawablePaddingOriginalPx;

            autoResizeAllAppsCells();

            autoResizeAllAppsCells();

        } else {

        } else {
@@ -619,7 +620,7 @@ public class DeviceProfile { 
    private void updateFolderCellSize(float scale, Resources res) {

    private void updateFolderCellSize(float scale, Resources res) {

        float invIconSizeDp = isVerticalBarLayout() ? inv.landscapeIconSize : inv.iconSize;

        float invIconSizeDp = isVerticalBarLayout() ? inv.landscapeIconSize : inv.iconSize;

        folderChildIconSizePx = Math.max(1, pxFromDp(invIconSizeDp, mMetrics, scale));

        folderChildIconSizePx = Math.max(1, pxFromDp(invIconSizeDp, mMetrics, scale));

        folderChildTextSizePx = pxFromDp(inv.iconTextSize, mMetrics, scale);

        folderChildTextSizePx = pxFromSp(inv.iconTextSize, mMetrics, scale);

        folderLabelTextSizePx = (int) (folderChildTextSizePx * folderLabelTextScale);

        folderLabelTextSizePx = (int) (folderChildTextSizePx * folderLabelTextScale);





        int textHeight = Utilities.calculateTextHeight(folderChildTextSizePx);

        int textHeight = Utilities.calculateTextHeight(folderChildTextSizePx);

src/com/android/launcher3/Utilities.java

+7 −2
Original line number Original line Diff line number Diff line
@@ -465,9 +465,14 @@ public final class Utilities { 
        return (int) (dp * Resources.getSystem().getDisplayMetrics().density);

        return (int) (dp * Resources.getSystem().getDisplayMetrics().density);

    }

    }







    public static int pxFromSp(float size, DisplayMetrics metrics) {

    public static int pxFromSp(float size, DisplayMetrics metrics) {

        return (int) Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP,

        return pxFromSp(size, metrics, 1f);

                size, metrics));

    }



    public static int pxFromSp(float size, DisplayMetrics metrics, float scale) {

        return Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP,

                size, metrics) * scale);

    }

    }





    public static String createDbSelectionQuery(String columnName, IntArray values) {

    public static String createDbSelectionQuery(String columnName, IntArray values) {