aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 03:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fixing folders to always show in view, removing old assets and references to LauncherModel count." into jb-ub-gel-agar

Browse Source
This commit is contained in:
Winson Chung
2013-08-26 22:08:09 +00:00
committed by Android (Google) Code Review
parent cc07e7a9c6 892c74d460
commit 6c15a644cb
36 changed files with 143 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/launcher3/Workspace.java
View File

@@ -2532,6 +2532,8 @@ public class Workspace extends SmoothPagedView
Point smallestSize = new Point();
Point largestSize = new Point();
display.getCurrentSizeRange(smallestSize, largestSize);
int countX = (int) grid.numColumns;
int countY = (int) grid.numRows;
if (orientation == CellLayout.LANDSCAPE) {
if (mLandscapeCellLayoutMetrics == null) {
Rect padding = grid.getWorkspacePadding(CellLayout.LANDSCAPE);
@@ -2539,7 +2541,7 @@ public class Workspace extends SmoothPagedView
int height = smallestSize.y - padding.top - padding.bottom;
mLandscapeCellLayoutMetrics = new Rect();
CellLayout.getMetrics(mLandscapeCellLayoutMetrics, width, height,
LauncherModel.getCellCountX(), LauncherModel.getCellCountY());
countX, countY);
}
return mLandscapeCellLayoutMetrics;
} else if (orientation == CellLayout.PORTRAIT) {
@@ -2549,7 +2551,7 @@ public class Workspace extends SmoothPagedView
int height = largestSize.y - padding.top - padding.bottom;
mPortraitCellLayoutMetrics = new Rect();
CellLayout.getMetrics(mPortraitCellLayoutMetrics, width, height,
LauncherModel.getCellCountX(), LauncherModel.getCellCountY());
countX, countY);
}
return mPortraitCellLayoutMetrics;
}