Merge "Extract cell horizontal space to a method" into tm-qpr-dev am: e3948da48d am: 0503560e16

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19746173

Change-Id: I812219395a915d2d078c5be2d07d07f434dd2a02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/launcher3/DeviceProfile.java

@@ -513,7 +513,7 @@ public class DeviceProfile {
     private int getIconToIconWidthForColumns(int columns) {
         return columns * getCellSize().x
                 + (columns - 1) * cellLayoutBorderSpacePx.x
-                - (getCellSize().x - iconSizePx);  // left and right cell space
+                - getCellHorizontalSpace();
     }
 
     private int getHorizontalMarginPx(InvariantDeviceProfile idp, Resources res) {
@@ -984,6 +984,13 @@ public class DeviceProfile {
         return result;
     }
 
+    /**
+     * Returns the left and right space on the cell, which is the cell width - icon size
+     */
+    public int getCellHorizontalSpace() {
+        return getCellSize().x - iconSizePx;
+    }
+
     /**
      * Gets the number of panels within the workspace.
      */