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

Commit 32af64cc authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Manually set mLastTileBottom when not laying out 

We want to use the correct bottom when using squishiness. As we cannot
override `setLeftTopRightBottom` in QSTileViewImpl, we manually set it
using the correct scale.

Test: manual
Fixes: 225405454
Change-Id: I9e6905a68fcb076842bb189bc75396067b6dfaa2
parent 5ec5a80c

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

+7 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ import com.android.systemui.R; 
import com.android.systemui.qs.QSPanel.QSTileLayout;

import com.android.systemui.qs.QSPanelControllerBase.TileRecord;

import com.android.systemui.qs.tileimpl.HeightOverrideable;

import com.android.systemui.qs.tileimpl.QSTileViewImplKt;



import java.util.ArrayList;
@@ -242,7 +243,12 @@ public class TileLayout extends ViewGroup implements QSTileLayout { 
                record.tileView.setLeftTopRightBottom(left, top, right, bottom);

            }

            record.tileView.setPosition(i);

            mLastTileBottom = bottom;

            if (forLayout) {

                mLastTileBottom = record.tileView.getBottom();

            } else {

                float scale = QSTileViewImplKt.constrainSquishiness(mSquishinessFraction);

                mLastTileBottom = top + (int) (record.tileView.getMeasuredHeight() * scale);

            }

        }

    }

packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt

+5 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ open class QSTileViewImpl @JvmOverloads constructor( 
        }

        // Limit how much we affect the height, so we don't have rounding artifacts when the tile

        // is too short.

        val constrainedSquishiness = 0.1f + squishinessFraction * 0.9f

        val constrainedSquishiness = constrainSquishiness(squishinessFraction)

        bottom = top + (actualHeight * constrainedSquishiness).toInt()

        scrollY = (actualHeight - height) / 2

    }
@@ -678,6 +678,10 @@ internal object SubtitleArrayMapping { 
    }

}



fun constrainSquishiness(squish: Float): Float {

    return 0.1f + squish * 0.9f

}



private fun colorValuesHolder(name: String, vararg values: Int): PropertyValuesHolder {

    return PropertyValuesHolder.ofInt(name, *values).apply {

        setEvaluator(ArgbEvaluator.getInstance())