From 244ebcd7b41fea9edbbbd12525973b1c6d6bcfe1 Mon Sep 17 00:00:00 2001 From: Michael Jurka Date: Mon, 8 Oct 2012 17:19:32 +0200 Subject: [PATCH] Bug 7301303: more rows in all apps for sw720dp-port --- src/com/android/launcher2/AppsCustomizePagedView.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java index b71726165b..5580381ca8 100644 --- a/src/com/android/launcher2/AppsCustomizePagedView.java +++ b/src/com/android/launcher2/AppsCustomizePagedView.java @@ -449,8 +449,10 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen if (mMaxAppCellCountX > -1) { maxCellCountX = Math.min(maxCellCountX, mMaxAppCellCountX); } + // Temp hack for now: only use the max cell count Y for widget layout + int maxWidgetCellCountY = maxCellCountY; if (mMaxAppCellCountY > -1) { - maxCellCountY = Math.min(maxCellCountY, mMaxAppCellCountY); + maxWidgetCellCountY = Math.min(maxWidgetCellCountY, mMaxAppCellCountY); } // Now that the data is ready, we can calculate the content width, the number of cells to @@ -466,6 +468,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen // Force a measure to update recalculate the gaps int widthSpec = MeasureSpec.makeMeasureSpec(getMeasuredWidth(), MeasureSpec.AT_MOST); int heightSpec = MeasureSpec.makeMeasureSpec(getMeasuredHeight(), MeasureSpec.AT_MOST); + mWidgetSpacingLayout.calculateCellCount(width, height, maxCellCountX, maxWidgetCellCountY); mWidgetSpacingLayout.measure(widthSpec, heightSpec); mContentWidth = mWidgetSpacingLayout.getContentWidth();