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 am: 29a2771b30

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18233169

Change-Id: Ie225ff9464a0ac4f7ba23ca6a622cef8db42b080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Fabian Kozynski
2022-05-10 20:39:20 +00:00
committed by Automerger Merge Worker
parent b8b7cf9e53 29a2771b30
commit e111825711
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; private int mMaxColumns = NO_MAX_COLUMNS;
protected int mResourceColumns; protected int mResourceColumns;
private float mSquishinessFraction = 1f; private float mSquishinessFraction = 1f;
private int mLastTileBottom; protected int mLastTileBottom;
public TileLayout(Context context) { public TileLayout(Context context) {
this(context, null); this(context, null);
@@ -243,12 +243,11 @@ public class TileLayout extends ViewGroup implements QSTileLayout {
record.tileView.setLeftTopRightBottom(left, top, right, bottom); record.tileView.setLeftTopRightBottom(left, top, right, bottom);
} }
record.tileView.setPosition(i); record.tileView.setPosition(i);
if (forLayout) {
mLastTileBottom = record.tileView.getBottom(); // Set the bottom to the unoverriden squished bottom. This is to avoid fake bottoms that
} else { // are only used for QQS -> QS expansion animations
float scale = QSTileViewImplKt.constrainSquishiness(mSquishinessFraction); float scale = QSTileViewImplKt.constrainSquishiness(mSquishinessFraction);
mLastTileBottom = top + (int) (record.tileView.getMeasuredHeight() * scale); mLastTileBottom = top + (int) (record.tileView.getMeasuredHeight() * scale);
}
} }
} }
@@ -258,7 +257,8 @@ public class TileLayout extends ViewGroup implements QSTileLayout {
} }
protected int getRowTop(int row) { 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) { protected int getColumnStart(int column) {