Merge "Extract cell horizontal space to a method" into tm-qpr-dev (e3948da4) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/DeviceProfile.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -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.
		*/