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

Add border spacing and fixed cell height to grid.

Browse Source 
- Border spacing is the spacing between the cells.
- Workspace cell height is now fixed, and we allocate
  all the "extra" space to three different variable height
  areas.

* Built behind ENABLE_FOUR_COLUMNS flag because it hinders the
default grid.

Bug: 175329686
Test: - set border spacing to 0 and confirm matches prior layout
      - test drag and drop still worked
      - test reordering
      - test widgets
      - test folders
      - test multiwindow

Change-Id: Ic6f3dff577d28ff214bda4b0a787ec7fd08c108b
This commit is contained in:
Jon Miranda
2021-02-09 11:05:00 -05:00
parent 6cd63cb4ee
commit 228877d37c
14 changed files with 481 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/android/launcher3/AppWidgetResizeFrame.java
View File

@@ -279,8 +279,9 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
* Based on the current deltas, we determine if and how to resize the widget.
*/
private void resizeWidgetIfNeeded(boolean onDismiss) {
float xThreshold = mCellLayout.getCellWidth();
float yThreshold = mCellLayout.getCellHeight();
DeviceProfile dp = mLauncher.getDeviceProfile();
float xThreshold = mCellLayout.getCellWidth() + dp.cellLayoutBorderSpacingPx;
float yThreshold = mCellLayout.getCellHeight() + dp.cellLayoutBorderSpacingPx;
int hSpanInc = getSpanIncrement((mDeltaX + mDeltaXAddOn) / xThreshold - mRunningHInc);
int vSpanInc = getSpanIncrement((mDeltaY + mDeltaYAddOn) / yThreshold - mRunningVInc);
@@ -364,13 +365,18 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
final float density = context.getResources().getDisplayMetrics().density;
final Point[] cellSize = CELL_SIZE.get(context);
final int borderSpacing = context.getResources()
.getDimensionPixelSize(R.dimen.dynamic_grid_cell_border_spacing);
final float hBorderSpacing = (spanX - 1) * borderSpacing;
final float vBorderSpacing = (spanY - 1) * borderSpacing;
// Compute landscape size
int landWidth = (int) ((spanX * cellSize[0].x) / density);
int landHeight = (int) ((spanY * cellSize[0].y) / density);
int landWidth = (int) (((spanX * cellSize[0].x) + hBorderSpacing) / density);
int landHeight = (int) (((spanY * cellSize[0].y) + vBorderSpacing) / density);
// Compute portrait size
int portWidth = (int) ((spanX * cellSize[1].x) / density);
int portHeight = (int) ((spanY * cellSize[1].y) / density);
int portWidth = (int) (((spanX * cellSize[1].x) + hBorderSpacing) / density);
int portHeight = (int) (((spanY * cellSize[1].y) + vBorderSpacing) / density);
rect.set(portWidth, landHeight, landWidth, portHeight);
return rect;
}
@@ -384,8 +390,9 @@ public class AppWidgetResizeFrame extends AbstractFloatingView implements View.O
}
private void onTouchUp() {
int xThreshold = mCellLayout.getCellWidth();
int yThreshold = mCellLayout.getCellHeight();
DeviceProfile dp = mLauncher.getDeviceProfile();
int xThreshold = mCellLayout.getCellWidth() + dp.cellLayoutBorderSpacingPx;
int yThreshold = mCellLayout.getCellHeight() + dp.cellLayoutBorderSpacingPx;
mDeltaXAddOn = mRunningHInc * xThreshold;
mDeltaYAddOn = mRunningVInc * yThreshold;