am a9c683d9: Merge "Fixing calculation of # of rows in All Apps" into honeycomb-mr2
* commit 'a9c683d97eff5fde190e2e60d25259cea53eab24': Fixing calculation of # of rows in All Apps
This commit is contained in:
@@ -174,7 +174,9 @@ public class AllAppsPagedView extends PagedViewWithDraggableItems implements All
|
|||||||
|
|
||||||
availableHeight -= mPageLayoutPaddingTop + mPageLayoutPaddingBottom;
|
availableHeight -= mPageLayoutPaddingTop + mPageLayoutPaddingBottom;
|
||||||
availableHeight -= cellHeight; // Assume at least one row
|
availableHeight -= cellHeight; // Assume at least one row
|
||||||
availableHeight -= screenHeight * 0.16f;
|
Resources r = getContext().getResources();
|
||||||
|
float scaleFactor = r.getInteger(R.integer.config_allAppsZoomScaleFactor) / 100f;
|
||||||
|
availableHeight -= screenHeight * scaleFactor;
|
||||||
if (availableHeight > 0) {
|
if (availableHeight > 0) {
|
||||||
return Math.min(mMaxCellCountY,
|
return Math.min(mMaxCellCountY,
|
||||||
1 + availableHeight / (cellHeight + mPageLayoutHeightGap));
|
1 + availableHeight / (cellHeight + mPageLayoutHeightGap));
|
||||||
|
|||||||
Reference in New Issue
Block a user