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

Commit 46759e76 authored by Alejandro Nijamkin's avatar Alejandro Nijamkin
Browse files

[flexiglass] Set up initial doze state early 

The attached bug occurs because the initial doze amount isn't being set
as soon as the Lockscreen scene is entered.

The fix is simple: set the initial doze amount when changing to the
Lockscreen scene, based on the KeyguardState.

Fix: 379848896
Test: manually verified by pressing the power button to enter AOD while
showing Bouncer but also when being unlocked and showing either Gone or
Shade
Flag: com.android.systemui.scene_container

Change-Id: I389ff51267ea84351b872455ffd5f0f928e3420b
parent 39829012

packages/SystemUI/src/com/android/keyguard/ClockEventController.kt

+10 −0
Original line number Original line Diff line number Diff line
@@ -63,6 +63,7 @@ import com.android.systemui.plugins.clocks.WeatherData 
import com.android.systemui.plugins.clocks.ZenData

import com.android.systemui.plugins.clocks.ZenData

import com.android.systemui.plugins.clocks.ZenData.ZenMode

import com.android.systemui.plugins.clocks.ZenData.ZenMode

import com.android.systemui.res.R as SysuiR

import com.android.systemui.res.R as SysuiR

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

import com.android.systemui.settings.UserTracker

import com.android.systemui.settings.UserTracker

import com.android.systemui.shared.regionsampling.RegionSampler

import com.android.systemui.shared.regionsampling.RegionSampler

import com.android.systemui.statusbar.policy.BatteryController

import com.android.systemui.statusbar.policy.BatteryController
@@ -465,6 +466,15 @@ constructor( 
        batteryController.addCallback(batteryCallback)

        batteryController.addCallback(batteryCallback)

        keyguardUpdateMonitor.registerCallback(keyguardUpdateMonitorCallback)

        keyguardUpdateMonitor.registerCallback(keyguardUpdateMonitorCallback)

        zenModeController.addCallback(zenModeCallback)

        zenModeController.addCallback(zenModeCallback)

        if (SceneContainerFlag.isEnabled) {

            handleDoze(

                when (AOD) {

                    keyguardTransitionInteractor.getCurrentState() -> 1f

                    keyguardTransitionInteractor.getStartedState() -> 1f

                    else -> 0f

                }

            )

        }

        disposableHandle =

        disposableHandle =

            parent.repeatWhenAttached {

            parent.repeatWhenAttached {

                repeatOnLifecycle(Lifecycle.State.CREATED) {

                repeatOnLifecycle(Lifecycle.State.CREATED) {