aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-04 01:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing issue with widget sizes being misreported.

Browse Source 
- Fixing NPE with getting page indicators in phone landscape

Change-Id: Id369596e38cbe7a161c0d1f62e62e4f4f3cc31b3
This commit is contained in:
Winson Chung
2013-08-20 16:56:15 -07:00
parent 81d6f6ecca
commit 6670073de8
3 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/android/launcher3/CellLayout.java
View File

@@ -927,12 +927,12 @@ public class CellLayout extends ViewGroup {
return r;
}
static void getMetrics(Rect metrics, Resources res, int measureWidth, int measureHeight,
int countX, int countY, int orientation) {
static void getMetrics(Rect metrics, int paddedMeasureWidth,
int paddedMeasureHeight, int countX, int countY) {
LauncherAppState app = LauncherAppState.getInstance();
DeviceProfile grid = app.getDynamicGrid().getDeviceProfile();
metrics.set(grid.calculateCellWidth(measureWidth, countX),
grid.calculateCellHeight(measureHeight, countY), 0, 0);
metrics.set(grid.calculateCellWidth(paddedMeasureWidth, countX),
grid.calculateCellHeight(paddedMeasureHeight, countY), 0, 0);
}
public void setFixedSize(int width, int height) {
@@ -2961,18 +2961,22 @@ public class CellLayout extends ViewGroup {
* @param result An array of length 2 in which to store the result (may be null).
*/
public int[] rectToCell(int width, int height, int[] result) {
return rectToCell(getResources(), width, height, result);
return rectToCell(width, height, result);
}
public static int[] rectToCell(Resources resources, int width, int height, int[] result) {
public static int[] rectToCell(int width, int height, int[] result) {
LauncherAppState app = LauncherAppState.getInstance();
DeviceProfile grid = app.getDynamicGrid().getDeviceProfile();
Rect padding = grid.getWorkspacePadding(grid.isLandscape ?
CellLayout.LANDSCAPE : CellLayout.PORTRAIT);
// Always assume we're working with the smallest span to make sure we
// reserve enough space in both orientations.
int actualWidth = grid.cellWidthPx;
int actualHeight = grid.cellHeightPx;
int smallerSize = Math.min(actualWidth, actualHeight);
int parentWidth = grid.calculateCellWidth(grid.widthPx
- padding.left - padding.right, (int) grid.numColumns);
int parentHeight = grid.calculateCellHeight(grid.heightPx
- padding.top - padding.bottom, (int) grid.numRows);
int smallerSize = Math.min(parentWidth, parentHeight);
// Always round up to next largest cell
int spanX = (int) Math.ceil(width / (float) smallerSize);