PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d6b50a48: am 1239b9da: Merge "Fixing issue with Widget sizes being icorrectly reported." into jb-ub-now-kermit

Browse Source 
* commit 'd6b50a4872fddefeb2fb24538631270af5d52b0c':
  Fixing issue with Widget sizes being icorrectly reported.
This commit is contained in:
Winson Chung
2014-02-14 20:54:35 +00:00
committed by Android Git Automerger
parent 7aa4ac9f66 d6b50a4872
commit 6772fd99c7
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/Workspace.java
+4 -6
View File
@@ -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),