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

Commit d49583bb authored by Chandru S's avatar Chandru S
Browse files

Add persistentEarlyWakeupRequired to BlurUtils to support early wake up flag... 

Add persistentEarlyWakeupRequired to BlurUtils to support early wake up flag being enabled for a longer period of time.

The plan is to set this to true when we are on the lockscreen to handle bouncer blur scenarios

Other changes:
 - remove code duplication and keep changes to earlyWakeupEnabled flag isolated to two methods.

Bug: 393199337
Bug: 381263619
Test: unit tests pending, tracked here 381263619
Flag: EXEMPT, new field that doesn't get set when flag is not enabled (controlled in child CLs)
Change-Id: I69e316a9e570bb1f2f7490615c29ec87e8b96963
parent 3da7bfe6

packages/SystemUI/src/com/android/systemui/statusbar/BlurUtils.kt

+68 −17
Original line number Diff line number Diff line
@@ -16,12 +16,15 @@ 


package com.android.systemui.statusbar



import android.annotation.SuppressLint

import android.app.ActivityManager

import android.content.res.Resources

import android.os.Build

import android.os.SystemProperties

import android.os.Trace

import android.os.Trace.TRACE_TAG_APP

import android.util.IndentingPrintWriter

import android.util.Log

import android.util.MathUtils

import android.view.CrossWindowBlurListeners

import android.view.CrossWindowBlurListeners.CROSS_WINDOW_BLUR_SUPPORTED
@@ -45,7 +48,7 @@ open class BlurUtils @Inject constructor( 
    private val crossWindowBlurListeners: CrossWindowBlurListeners,

    dumpManager: DumpManager

) : Dumpable {

    val minBlurRadius = resources.getDimensionPixelSize(R.dimen.min_window_blur_radius).toFloat();

    val minBlurRadius = resources.getDimensionPixelSize(R.dimen.min_window_blur_radius).toFloat()

    val maxBlurRadius = if (Flags.notificationShadeBlur()) {

        blurConfig.maxBlurRadiusPx

    } else {
@@ -55,6 +58,9 @@ open class BlurUtils @Inject constructor( 
    private var lastAppliedBlur = 0

    private var earlyWakeupEnabled = false



    /** When this is true, early wakeup flag is not reset on surface flinger when blur drops to 0 */

    private var persistentEarlyWakeupRequired = false



    init {

        dumpManager.registerDumpable(this)

    }
@@ -91,11 +97,8 @@ open class BlurUtils @Inject constructor( 
            return

        }

        if (lastAppliedBlur == 0 && radius != 0) {

            Trace.asyncTraceForTrackBegin(

                    TRACE_TAG_APP, TRACK_NAME, "eEarlyWakeup (prepareBlur)", 0)

            earlyWakeupEnabled = true

            createTransaction().use {

                it.setEarlyWakeupStart()

                earlyWakeupStart(it, "eEarlyWakeup (prepareBlur)")

                it.apply()

            }

        }
@@ -116,19 +119,15 @@ open class BlurUtils @Inject constructor( 
            if (shouldBlur(radius)) {

                it.setBackgroundBlurRadius(viewRootImpl.surfaceControl, radius)

                if (!earlyWakeupEnabled && lastAppliedBlur == 0 && radius != 0) {

                    Trace.asyncTraceForTrackBegin(

                        TRACE_TAG_APP,

                        TRACK_NAME,

                        "eEarlyWakeup (applyBlur)",

                        0

                    )

                    it.setEarlyWakeupStart()

                    earlyWakeupEnabled = true

                    earlyWakeupStart(it, "eEarlyWakeup (applyBlur)")

                }

                if (earlyWakeupEnabled && lastAppliedBlur != 0 && radius == 0) {

                    it.setEarlyWakeupEnd()

                    Trace.asyncTraceForTrackEnd(TRACE_TAG_APP, TRACK_NAME, 0)

                    earlyWakeupEnabled = false

                if (

                    earlyWakeupEnabled &&

                        lastAppliedBlur != 0 &&

                        radius == 0 &&

                        !persistentEarlyWakeupRequired

                ) {

                    earlyWakeupEnd(it, "applyBlur")

                }

                lastAppliedBlur = radius

            }
@@ -137,6 +136,26 @@ open class BlurUtils @Inject constructor( 
        }

    }



    private fun v(verboseLog: String) {

        if (isLoggable) Log.v(TAG, verboseLog)

    }



    @SuppressLint("MissingPermission")

    private fun earlyWakeupStart(transaction: SurfaceControl.Transaction, traceMethodName: String) {

        v("earlyWakeupStart from $traceMethodName")

        Trace.asyncTraceForTrackBegin(TRACE_TAG_APP, TRACK_NAME, traceMethodName, 0)

        transaction.setEarlyWakeupStart()

        earlyWakeupEnabled = true

    }



    @SuppressLint("MissingPermission")

    private fun earlyWakeupEnd(transaction: SurfaceControl.Transaction, loggingContext: String) {

        v("earlyWakeupEnd from $loggingContext")

        transaction.setEarlyWakeupEnd()

        Trace.asyncTraceForTrackEnd(TRACE_TAG_APP, TRACK_NAME, 0)

        earlyWakeupEnabled = false

    }



    @VisibleForTesting

    open fun createTransaction(): SurfaceControl.Transaction {

        return SurfaceControl.Transaction()
@@ -177,7 +196,39 @@ open class BlurUtils @Inject constructor( 
        }

    }



    /**

     * Enables/disables the early wakeup flag on surface flinger. Keeps the early wakeup flag on

     * until it reset by passing false to this method.

     */

    fun setPersistentEarlyWakeup(persistentWakeup: Boolean, viewRootImpl: ViewRootImpl?) {

        persistentEarlyWakeupRequired = persistentWakeup

        if (viewRootImpl == null || !supportsBlursOnWindows()) return

        if (persistentEarlyWakeupRequired) {

            if (earlyWakeupEnabled) return

            createTransaction().use {

                earlyWakeupStart(it, "setEarlyWakeup")

                it.apply()

            }

        } else {

            if (!earlyWakeupEnabled) return

            if (lastAppliedBlur > 0) {

                Log.w(

                    TAG,

                    "resetEarlyWakeup invoked when lastAppliedBlur $lastAppliedBlur is " +

                        "non-zero, this means that the early wakeup signal was reset while blur" +

                        " was still active",

                )

            }

            createTransaction().use {

                earlyWakeupEnd(it, "resetEarlyWakeup")

                it.apply()

            }

        }

    }



    companion object {

        const val TRACK_NAME = "BlurUtils"

        private const val TAG = "BlurUtils"

        private val isLoggable = Log.isLoggable(TAG, Log.VERBOSE) || Build.isDebuggable()

    }

}