Merge "Fixing issue with Widget sizes being icorrectly reported." into jb-ub-now-kermit (1239b9da) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/Workspace.java

+4 −6

Original line number	Diff line number	Diff line
		@@ -3115,13 +3115,11 @@ public class Workspace extends SmoothPagedView
		display.getCurrentSizeRange(smallestSize, largestSize);
		int countX = (int) grid.numColumns;
		int countY = (int) grid.numRows;
		int constrainedLongEdge = largestSize.y;
		int constrainedShortEdge = smallestSize.y;
		if (orientation == CellLayout.LANDSCAPE) {
		if (mLandscapeCellLayoutMetrics == null) {
		Rect padding = grid.getWorkspacePadding(CellLayout.LANDSCAPE);
		int width = constrainedLongEdge - padding.left - padding.right;
		int height = constrainedShortEdge - padding.top - padding.bottom;
		int width = largestSize.x - padding.left - padding.right;
		int height = smallestSize.y - padding.top - padding.bottom;
		mLandscapeCellLayoutMetrics = new Rect();
		mLandscapeCellLayoutMetrics.set(
		grid.calculateCellWidth(width, countX),
		@@ -3131,8 +3129,8 @@ public class Workspace extends SmoothPagedView
		} else if (orientation == CellLayout.PORTRAIT) {
		if (mPortraitCellLayoutMetrics == null) {
		Rect padding = grid.getWorkspacePadding(CellLayout.PORTRAIT);
		int width = constrainedShortEdge - padding.left - padding.right;
		int height = constrainedLongEdge - padding.top - padding.bottom;
		int width = smallestSize.x - padding.left - padding.right;
		int height = largestSize.y - padding.top - padding.bottom;
		mPortraitCellLayoutMetrics = new Rect();
		mPortraitCellLayoutMetrics.set(
		grid.calculateCellWidth(width, countX),