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

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

setOpaque to true on the surface whenever blur is not supported. 

The top surface is now considered opaque and will not combine the alpha channels from the buffer for the window below.

Other changes:
 - Adds additional logs for blurRadius and isBlurOpaque

Bug: 405288154
Flag: com.android.systemui.bouncer_ui_revamp
Bug: 381263619
Test: verified manually by enabling/disabling battery saver repeatedly
Change-Id: I1a061dc111a5771c02457ea5c36f32cbe3cba699
parent b9b693d0

packages/SystemUI/src/com/android/systemui/window/ui/WindowRootViewBinder.kt

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ object WindowRootViewBinder { 
                                "appliedBlurRadius",

                                blurRadiusToApply,

                            )

                            viewModel.onBlurApplied(blurRadiusToApply)

                            viewModel.onBlurApplied(blurRadiusToApply, lastScheduleBlurOpaqueness)

                        }



                        combine(viewModel.blurRadius, viewModel.isBlurOpaque, ::Pair)

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

+18 −14
Original line number Diff line number Diff line
@@ -69,13 +69,15 @@ constructor( 
            .merge()



    val blurRadius: Flow<Float> =

        blurInteractor.isBlurCurrentlySupported.flatMapLatest { blurSupported ->

        blurInteractor.isBlurCurrentlySupported

            .flatMapLatest { blurSupported ->

                if (blurSupported) {

                    _blurRadius

                } else {

                    flowOf(0f)

                }

            }

            .logIfPossible("blurRadius")



    val isPersistentEarlyWakeupRequired =

        blurInteractor.isBlurCurrentlySupported
@@ -96,17 +98,19 @@ constructor( 
            .logIfPossible("isPersistentEarlyWakeupRequired")



    val isBlurOpaque =

        blurInteractor.isBlurCurrentlySupported.flatMapLatest { blurSupported ->

        blurInteractor.isBlurCurrentlySupported

            .flatMapLatest { blurSupported ->

                if (blurSupported) {

                    blurInteractor.isBlurOpaque.distinctUntilChanged().logIfPossible("isBlurOpaque")

                } else {

                flowOf(false)

                    flowOf(true)

                }

            }

            .logIfPossible("isBlurOpaque")



    fun onBlurApplied(blurRadius: Int) {

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

        if (isLoggable) {

            Log.d(TAG, "blur applied for radius $blurRadius")

            Log.d(TAG, "blur applied for radius blurRadius: $blurRadius, isOpaque: $isOpaque")

        }

        blurInteractor.onBlurApplied(blurRadius)

    }