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

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

Very minor changes for performance isolation 

When shade blur is not enabled, bouncer blur should be ramped down to min blur radius when go back to expanded shade

The high blur radius was still being applied behind the shade when we leave the bouncer

Bug: 370555003
Test: no-op
Flag: com.android.systemui.bouncer_ui_revamp
Change-Id: I4ab596166fbc6fd7757ca8ee639b45c8fb53d2fa
parent 865fec2d

packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/AlternateBouncerToPrimaryBouncerTransitionViewModel.kt

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ constructor( 
                if (Flags.notificationShadeBlur()) {

                    transitionAnimation.immediatelyTransitionTo(blurConfig.maxBlurRadiusPx)

                } else {

                    emptyFlow()

                    transitionAnimation.immediatelyTransitionTo(blurConfig.minBlurRadiusPx)

                },

            flowWhenShadeIsNotExpanded =

                transitionAnimation.sharedFlow(

packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/OccludedToPrimaryBouncerTransitionViewModel.kt

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ constructor( 
                if (Flags.notificationShadeBlur()) {

                    transitionAnimation.immediatelyTransitionTo(blurConfig.maxBlurRadiusPx)

                } else {

                    emptyFlow()

                    transitionAnimation.immediatelyTransitionTo(blurConfig.minBlurRadiusPx)

                },

            flowWhenShadeIsNotExpanded =

                transitionAnimation.immediatelyTransitionTo(blurConfig.maxBlurRadiusPx),

packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/PrimaryBouncerToLockscreenTransitionViewModel.kt

+1 −2
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import com.android.systemui.scene.shared.model.Overlays 
import javax.inject.Inject

import kotlin.time.Duration.Companion.milliseconds

import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.emptyFlow



/**

 * Breaks down PRIMARY BOUNCER->LOCKSCREEN transition into discrete steps for corresponding views to
@@ -81,7 +80,7 @@ constructor( 
                if (Flags.notificationShadeBlur()) {

                    transitionAnimation.immediatelyTransitionTo(blurConfig.maxBlurRadiusPx)

                } else {

                    emptyFlow()

                    transitionAnimation.immediatelyTransitionTo(blurConfig.minBlurRadiusPx)

                },

            flowWhenShadeIsNotExpanded =

                transitionAnimation.sharedFlow(

packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/PrimaryBouncerToOccludedTransitionViewModel.kt

+1 −2
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import com.android.systemui.keyguard.ui.transitions.BlurConfig 
import com.android.systemui.keyguard.ui.transitions.PrimaryBouncerTransition

import javax.inject.Inject

import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.emptyFlow



@SysUISingleton

class PrimaryBouncerToOccludedTransitionViewModel
@@ -51,7 +50,7 @@ constructor( 
                if (Flags.notificationShadeBlur()) {

                    transitionAnimation.immediatelyTransitionTo(blurConfig.maxBlurRadiusPx)

                } else {

                    emptyFlow()

                    transitionAnimation.immediatelyTransitionTo(blurConfig.minBlurRadiusPx)

                },

            flowWhenShadeIsNotExpanded =

                transitionAnimation.immediatelyTransitionTo(blurConfig.minBlurRadiusPx),