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

Commit c79b5379 authored by Hawkwood Glazier's avatar Hawkwood Glazier Committed by Android (Google) Code Review
Browse files

Merge "Update lastUnconstraintedTextSize from setTextSize" into main

parents 9e71ab06 8d0c6e2d

packages/SystemUI/customization/src/com/android/systemui/shared/clocks/AnimatableClockView.kt

+9 −1
Original line number Diff line number Diff line
@@ -190,12 +190,20 @@ class AnimatableClockView @JvmOverloads constructor( 
        refreshFormat()

    }



    override fun setTextSize(type: Int, size: Float) {

        super.setTextSize(type, size)

        if (type == TypedValue.COMPLEX_UNIT_PX) {

            lastUnconstrainedTextSize = size

        }

    }



    @SuppressLint("DrawAllocation")

    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {

        logger.d("onMeasure")

        if (migratedClocks && !isSingleLineInternal &&

                MeasureSpec.getMode(heightMeasureSpec) == EXACTLY) {

            setTextSize(TypedValue.COMPLEX_UNIT_PX,

            // Call straight into TextView.setTextSize to avoid setting lastUnconstrainedTextSize

            super.setTextSize(TypedValue.COMPLEX_UNIT_PX,

                    min(lastUnconstrainedTextSize, MeasureSpec.getSize(heightMeasureSpec) / 2F))

        }

        super.onMeasure(widthMeasureSpec, heightMeasureSpec)