Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix last tile bottom calculation" into tm-dev

Browse Source
This commit is contained in:
Fabian Kozynski
2022-05-10 16:31:27 +00:00
committed by Android (Google) Code Review
parent 2ec2deea7d 0b85649636
commit 29a2771b30
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SystemUI/src/com/android/systemui/qs/TileLayout.java
View File

@@ -47,7 +47,7 @@ public class TileLayout extends ViewGroup implements QSTileLayout {
private int mMaxColumns = NO_MAX_COLUMNS;
protected int mResourceColumns;
private float mSquishinessFraction = 1f;
private int mLastTileBottom;
protected int mLastTileBottom;
public TileLayout(Context context) {
this(context, null);
@@ -243,12 +243,11 @@ public class TileLayout extends ViewGroup implements QSTileLayout {
record.tileView.setLeftTopRightBottom(left, top, right, bottom);
}
record.tileView.setPosition(i);
if (forLayout) {
mLastTileBottom = record.tileView.getBottom();
} else {
float scale = QSTileViewImplKt.constrainSquishiness(mSquishinessFraction);
mLastTileBottom = top + (int) (record.tileView.getMeasuredHeight() * scale);
}
// Set the bottom to the unoverriden squished bottom. This is to avoid fake bottoms that
// are only used for QQS -> QS expansion animations
float scale = QSTileViewImplKt.constrainSquishiness(mSquishinessFraction);
mLastTileBottom = top + (int) (record.tileView.getMeasuredHeight() * scale);
}
}
@@ -258,7 +257,8 @@ public class TileLayout extends ViewGroup implements QSTileLayout {
}
protected int getRowTop(int row) {
return (int) (row * (mCellHeight * mSquishinessFraction + mCellMarginVertical));
float scale = QSTileViewImplKt.constrainSquishiness(mSquishinessFraction);
return (int) (row * (mCellHeight * scale + mCellMarginVertical));
}
protected int getColumnStart(int column) {