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

am af263737: Merge "Fixing regression in calculating workspace padding." into ub-launcher3-burnaby

Browse Source 
* commit 'af2637376f5fb37d1dfa598a8c95a623367501ce':
  Fixing regression in calculating workspace padding.
This commit is contained in:
Winson Chung
2015-07-13 23:38:36 +00:00
committed by Android Git Automerger
parent 3155e34856 af2637376f
commit 4988ae8cda
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -265,7 +265,7 @@ public class DeviceProfile {
if (isTablet) {
// Pad the left and right of the workspace to ensure consistent spacing
// between all icons
int width = isLandscape ? Math.max(widthPx, heightPx) : Math.min(widthPx, heightPx);
int width = getCurrentWidth();
// XXX: If the icon size changes across orientations, we will have to take
// that into account here too.
int gap = (int) ((width - 2 * edgeMarginPx -
@@ -301,12 +301,8 @@ public class DeviceProfile {
// Pad the left and right of the workspace to ensure consistent spacing
// between all icons
float gapScale = 1f + (dragViewScale - 1f) / 2f;
int width = isLandscape
? Math.max(widthPx, heightPx)
: Math.min(widthPx, heightPx);
int height = isLandscape
? Math.max(widthPx, heightPx)
: Math.min(widthPx, heightPx);
int width = getCurrentWidth();
int height = getCurrentHeight();
int paddingTop = searchBarBounds.bottom;
int paddingBottom = hotseatBarHeightPx + pageIndicatorHeightPx;
int availableWidth = Math.max(0, width - (int) ((inv.numColumns * cellWidthPx) +
@@ -517,4 +513,16 @@ public class DeviceProfile {
}
}
}
private int getCurrentWidth() {
return isLandscape
? Math.max(widthPx, heightPx)
: Math.min(widthPx, heightPx);
}
private int getCurrentHeight() {
return isLandscape
? Math.min(widthPx, heightPx)
: Math.max(widthPx, heightPx);
}
}