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

Commit 146a5bf2 authored by Alejandro Nijamkin's avatar Alejandro Nijamkin
Browse files

[flexiglass] Adds CUI marker when locking and entering AOD 

CUJ_SCREEN_OFF_SHOW_AOD

Fix: 387321763
Test: manually verified that the CUJ_SCREEN_OFF_SHOW_AOD is reported
when the display goes off and enters AOD at the same time
Flag: com.android.systemui.scene_container

Change-Id: I04411bcb3bf315437141334f676569c47d7b59d5
parent 2efa0184

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt

+0 −4
Original line number Diff line number Diff line
@@ -161,10 +161,6 @@ constructor( 
    }



    private fun bindJankViewModel() {

        if (SceneContainerFlag.isEnabled) {

            return

        }



        jankHandle?.dispose()

        jankHandle =

            KeyguardJankBinder.bind(

packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardJankBinder.kt

+11 −7
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import com.android.systemui.keyguard.shared.model.TransitionState 
import com.android.systemui.keyguard.shared.model.TransitionStep

import com.android.systemui.keyguard.ui.viewmodel.KeyguardJankViewModel

import com.android.systemui.lifecycle.repeatWhenAttached

import com.android.systemui.scene.shared.flag.SceneContainerFlag

import kotlinx.coroutines.CoroutineDispatcher

import kotlinx.coroutines.DisposableHandle

import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -79,6 +80,8 @@ object KeyguardJankBinder { 
                    }

                }



                // The following is already done in KeyguardTransitionAnimationCallbackImpl.

                if (!SceneContainerFlag.isEnabled) {

                    launch {

                        viewModel.lockscreenToAodTransition.collect {

                            processStep(it, CUJ_LOCKSCREEN_TRANSITION_TO_AOD)
@@ -94,3 +97,4 @@ object KeyguardJankBinder { 
            }

        }

    }

}