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

Commit 171ee669 authored by Thales Lima's avatar Thales Lima
Browse files

Fix test and DeviceProfile dump 

The test  was parsing the paddings file with the wrong context passed to the dump method.

Fix: 259998761
Test: DeviceProfileTest
Change-Id: Ia5c243348d7334387bd7a15c3e496a1dc81570a5
parent 654ba7f6

src/com/android/launcher3/DeviceProfile.java

+3 −6
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ public class DeviceProfile { 
    public final int workspaceSpringLoadedMinNextPageVisiblePx;



    private final int extraSpace;

    private int maxEmptySpace;

    public int workspaceTopPadding;

    public int workspaceBottomPadding;
@@ -503,6 +504,7 @@ public class DeviceProfile { 
            int unscaledExtraSpace = (int) (extraSpace / cellScaleToFit);

            DevicePaddings devicePaddings = new DevicePaddings(context, inv.devicePaddingId);

            DevicePadding padding = devicePaddings.getDevicePadding(unscaledExtraSpace);

            maxEmptySpace = padding.getMaxEmptySpacePx();



            int paddingWorkspaceTop = padding.getWorkspaceTopPadding(unscaledExtraSpace);

            int paddingWorkspaceBottom = padding.getWorkspaceBottomPadding(unscaledExtraSpace);
@@ -1566,12 +1568,7 @@ public class DeviceProfile { 
        writer.println(prefix + pxToDpStr("extraSpace", extraSpace));

        writer.println(prefix + pxToDpStr("unscaled extraSpace", extraSpace / iconScale));



        if (inv.devicePaddingId != INVALID_RESOURCE_HANDLE) {

            int unscaledExtraSpace = (int) (extraSpace / iconScale);

            DevicePaddings devicePaddings = new DevicePaddings(context, inv.devicePaddingId);

            writer.println(prefix + pxToDpStr("maxEmptySpace",

                    devicePaddings.getDevicePadding(unscaledExtraSpace).getMaxEmptySpacePx()));

        }

        writer.println(prefix + pxToDpStr("maxEmptySpace", maxEmptySpace));

        writer.println(prefix + pxToDpStr("workspaceTopPadding", workspaceTopPadding));

        writer.println(prefix + pxToDpStr("workspaceBottomPadding", workspaceBottomPadding));