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

Commit b9f2a77b authored by Hawkwood Glazier's avatar Hawkwood Glazier
Browse files

Log Clock Visibility & Alpha changes in logbuffers 

Reduce frequency of some of superflous invalidate logs

Bug: 389987229
Test: Checked logs
Flag: NONE Logging change
Change-Id: I16d2fbf51a6d769c93b7a73ddfbcece4a158bcc7
parent 577df713

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

+38 −2
Original line number Diff line number Diff line
@@ -139,13 +139,49 @@ class FlexClockView(clockCtx: ClockContext) : FrameLayout(clockCtx.context) { 
        digitalClockTextViewMap.forEach { (_, textView) -> textView.refreshText() }

    }



    override fun setVisibility(visibility: Int) {

        if (visibility != this.visibility) {

            logger.d({ "setVisibility(${str1 ?: int1})" }) {

                int1 = visibility

                str1 =

                    when (visibility) {

                        VISIBLE -> "VISIBLE"

                        INVISIBLE -> "INVISIBLE"

                        GONE -> "GONE"

                        else -> null

                    }

            }

        }



        super.setVisibility(visibility)

    }



    private var loggedAlpha = 1000f



    override fun setAlpha(alpha: Float) {

        val delta = if (alpha <= 0f || alpha >= 1f) 0.001f else 0.5f

        if (abs(loggedAlpha - alpha) >= delta) {

            loggedAlpha = alpha

            logger.d({ "setAlpha($double1)" }) { double1 = alpha.toDouble() }

        }

        super.setAlpha(alpha)

    }



    private val isDrawn: Boolean

        get() = (mPrivateFlags and 0x20 /* PFLAG_DRAWN */) > 0



    override fun invalidate() {

        if (isDrawn && visibility == VISIBLE) {

            logger.d("invalidate()")

        }



        super.invalidate()

    }



    override fun requestLayout() {

        if (!isLayoutRequested()) {

            logger.d("requestLayout()")

        }

        super.requestLayout()

    }

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

+40 −2
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import com.android.systemui.shared.clocks.DimensionParser 
import com.android.systemui.shared.clocks.FontTextStyle

import com.android.systemui.shared.clocks.LogUtil

import java.lang.Thread

import kotlin.math.abs

import kotlin.math.max

import kotlin.math.min
@@ -207,7 +208,10 @@ open class SimpleDigitalClockTextView(clockCtx: ClockContext, attrs: AttributeSe 
    }



    override fun onDraw(canvas: Canvas) {

        logger.d({ "onDraw(); ls: $str1" }) { str1 = textAnimator.textInterpolator.shapedText }

        logger.d({ "onDraw(${str1?.replace("\n", "\\n")})" }) {

            str1 = textAnimator.textInterpolator.shapedText

        }



        val translation = getLocalTranslation()

        canvas.translate(translation.x.toFloat(), translation.y.toFloat())

        digitTranslateAnimator?.let {
@@ -222,8 +226,42 @@ open class SimpleDigitalClockTextView(clockCtx: ClockContext, attrs: AttributeSe 
        canvas.translate(-translation.x.toFloat(), -translation.y.toFloat())

    }



    override fun setVisibility(visibility: Int) {

        if (visibility != this.visibility) {

            logger.d({ "setVisibility(${str1 ?: int1})" }) {

                int1 = visibility

                str1 =

                    when (visibility) {

                        VISIBLE -> "VISIBLE"

                        INVISIBLE -> "INVISIBLE"

                        GONE -> "GONE"

                        else -> null

                    }

            }

        }



        super.setVisibility(visibility)

    }



    private var loggedAlpha = 1000f



    override fun setAlpha(alpha: Float) {

        val delta = if (alpha <= 0f || alpha >= 1f) 0.001f else 0.5f

        if (abs(loggedAlpha - alpha) >= delta) {

            loggedAlpha = alpha

            logger.d({ "setAlpha($double1)" }) { double1 = alpha.toDouble() }

        }

        super.setAlpha(alpha)

    }



    private val isDrawn: Boolean

        get() = (mPrivateFlags and 0x20 /* PFLAG_DRAWN */) > 0



    override fun invalidate() {

        if (isDrawn && visibility == VISIBLE) {

            logger.d("invalidate()")

        }



        super.invalidate()

        (parent as? FlexClockView)?.invalidate()

    }