From 171ee669dec244b912aea803c2ab68be899bdfa0 Mon Sep 17 00:00:00 2001
From: Thales Lima <tsuharesu@google.com>
Date: Tue, 22 Nov 2022 15:52:49 +0000
Subject: [PATCH] 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
---
 src/com/android/launcher3/DeviceProfile.java | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 92530eaae6..3f4d0360c1 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -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));