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

Change the access of cellX/Y of CellLayoutLayoutParams to private

Browse Source 
Bug: 188081026
Test: no op change, should compile
Test: ReorderWidgets
Change-Id: I20367974e5a4cead406e18eb66dafd4d59651b2a
Merged-In: I20367974e5a4cead406e18eb66dafd4d59651b2a
This commit is contained in:
Sebastian Franco
2023-01-03 15:16:22 -07:00
committed by Sebastián Franco
parent 60c7dfec29
commit 877088e6c3
11 changed files with 136 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
src/com/android/launcher3/celllayout/CellLayoutLayoutParams.java
View File

@@ -29,29 +29,17 @@ import androidx.annotation.Nullable;
*/
public class CellLayoutLayoutParams extends ViewGroup.MarginLayoutParams {
public int screenId = -1;
private int mScreenId = -1;
/**
* Horizontal location of the item in the grid.
*/
@ViewDebug.ExportedProperty
public int cellX;
private int mCellX;
/**
* Vertical location of the item in the grid.
*/
@ViewDebug.ExportedProperty
public int cellY;
private int mCellY;
/**
* Temporary horizontal location of the item in the grid during reorder
*/
public int tmpCellX;
private int mTmpCellX;
/**
* Temporary vertical location of the item in the grid during reorder
*/
public int tmpCellY;
private int mTmpCellY;
/**
* Indicates that the temporary coordinates should be used to layout the items
@@ -105,24 +93,24 @@ public class CellLayoutLayoutParams extends ViewGroup.MarginLayoutParams {
public CellLayoutLayoutParams(CellLayoutLayoutParams source) {
super(source);
this.cellX = source.cellX;
this.cellY = source.cellY;
this.mCellX = source.getCellX();
this.mCellY = source.getCellY();
this.cellHSpan = source.cellHSpan;
this.cellVSpan = source.cellVSpan;
this.screenId = source.screenId;
this.tmpCellX = source.tmpCellX;
this.tmpCellY = source.tmpCellY;
this.mScreenId = source.getScreenId();
this.mTmpCellX = source.getTmpCellX();
this.mTmpCellY = source.getTmpCellY();
this.useTmpCoords = source.useTmpCoords;
}
public CellLayoutLayoutParams(int cellX, int cellY, int cellHSpan, int cellVSpan,
int screenId) {
super(CellLayoutLayoutParams.MATCH_PARENT, CellLayoutLayoutParams.MATCH_PARENT);
this.cellX = cellX;
this.cellY = cellY;
this.mCellX = cellX;
this.mCellY = cellY;
this.cellHSpan = cellHSpan;
this.cellVSpan = cellVSpan;
this.screenId = screenId;
this.mScreenId = screenId;
}
/**
@@ -148,8 +136,8 @@ public class CellLayoutLayoutParams extends ViewGroup.MarginLayoutParams {
if (isLockedToGrid) {
final int myCellHSpan = cellHSpan;
final int myCellVSpan = cellVSpan;
int myCellX = useTmpCoords ? tmpCellX : cellX;
int myCellY = useTmpCoords ? tmpCellY : cellY;
int myCellX = useTmpCoords ? getTmpCellX() : getCellX();
int myCellY = useTmpCoords ? getTmpCellY() : getCellY();
if (invertHorizontally) {
myCellX = colCount - myCellX - cellHSpan;
@@ -179,14 +167,66 @@ public class CellLayoutLayoutParams extends ViewGroup.MarginLayoutParams {
* Sets the position to the provided point
*/
public void setCellXY(Point point) {
cellX = point.x;
cellY = point.y;
setCellX(point.x);
setCellY(point.y);
}
/**
* @return the string representation of the position of the {@link CellLayoutLayoutParams}
*/
public String toString() {
return "(" + this.cellX + ", " + this.cellY + ")";
return "(" + this.getCellX() + ", " + this.getCellY() + ")";
}
public int getScreenId() {
return mScreenId;
}
public void setScreenId(int screenId) {
this.mScreenId = screenId;
}
/**
* Horizontal location of the item in the grid.
*/
public int getCellX() {
return mCellX;
}
public void setCellX(int cellX) {
this.mCellX = cellX;
}
/**
* Vertical location of the item in the grid.
*/
public int getCellY() {
return mCellY;
}
public void setCellY(int cellY) {
this.mCellY = cellY;
}
/**
* Temporary horizontal location of the item in the grid during reorder
*/
public int getTmpCellX() {
return mTmpCellX;
}
public void setTmpCellX(int tmpCellX) {
this.mTmpCellX = tmpCellX;
}
/**
* Temporary vertical location of the item in the grid during reorder
*/
public int getTmpCellY() {
return mTmpCellY;
}
public void setTmpCellY(int tmpCellY) {
this.mTmpCellY = tmpCellY;
}
}