Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e892fc4b authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Fix last tile bottom calculation" into tm-dev am: 29a2771b am: e304b0ae am: 2bbaa4c6 

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



Change-Id: I859aa76e20fdd1bafab1141f4a22e977c5ab0400
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 49baad0d 2bbaa4c6

packages/SystemUI/src/com/android/systemui/qs/TileLayout.java

+8 −8
Original line number Diff line number Diff line
@@ -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,14 +243,13 @@ 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 {



            // 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);

        }

    }

    }



    @Override

    protected void onLayout(boolean changed, int l, int t, int r, int b) {
@@ -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) {