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

Commit 50ecbee2 authored by Tracy Zhou's avatar Tracy Zhou Committed by Android (Google) Code Review
Browse files

Merge "Set opaque to false always when applyBlur() when shade blur flag is on" into main

parents 70664042 7a7e2c9f

packages/SystemUI/src/com/android/systemui/window/ui/viewmodel/WindowRootViewModel.kt

+1 −13
Original line number Diff line number Diff line
@@ -116,19 +116,7 @@ constructor( 
     * composited with the alpha channels from the surfaces below while rendering.

     */

    val isSurfaceOpaque =

        combine(blurInteractor.isBlurCurrentlySupported, shadeInteractor.isAnyFullyExpanded) {

                blurSupported,

                anyShadeFullyExpanded ->

                if (blurSupported) {

                    // scrims will be opaque when shade is fully expanded

                    // Fall back to old behavior when shade blur is not enabled.

                    !Flags.notificationShadeBlur() && anyShadeFullyExpanded

                } else {

                    anyShadeFullyExpanded

                }

            }

            .distinctUntilChanged()

            .logIfPossible("isSurfaceOpaque")

        if (Flags.notificationShadeBlur()) flowOf(false) else shadeInteractor.isAnyFullyExpanded



    fun onBlurApplied(blurRadius: Int, isOpaque: Boolean) {

        if (isLoggable) {