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

Commit 4757c8cc authored by Adrian Roos's avatar Adrian Roos
Browse files

Keyguard: only show after screen fully turned off 

Fixes an issue where the keyguard was displayed before the screen
was turned off fully, causing the AOD screen to briefly show during
the screen off animation.

Change-Id: Idc4621995bd67c1db255fab5a8de60d3aeef5d18
Fixes: 63526727
Test: Turn screen off. Make sure the AOD clock is not visible
parent 731d4dfe

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+7 −5
Original line number Diff line number Diff line
@@ -4199,10 +4199,7 @@ public class StatusBar extends SystemUI implements DemoMode, 


    public void showKeyguard() {

        mKeyguardRequested = true;

        // Unconditionally show keyguard again. There's some logic that relies on this

        // being called even when the keyguard is already showing, e.g. for updating

        // sensitiveness of notifications and making sure the panels are expanded.

        showKeyguardImpl();

        updateIsKeyguard();

    }



    public boolean hideKeyguard() {
@@ -4222,7 +4219,12 @@ public class StatusBar extends SystemUI implements DemoMode, 
            updatePanelExpansionForKeyguard();

        }

        if (shouldBeKeyguard) {

            if (isGoingToSleep()

                    && mScreenLifecycle.getScreenState() == ScreenLifecycle.SCREEN_TURNING_OFF) {

                // Delay showing the keyguard until screen turned off.

            } else {

                showKeyguardImpl();

            }

        } else {

            return hideKeyguardImpl();

        }