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

Commit 3def39d3 authored by Matt Pietal's avatar Matt Pietal Committed by Android (Google) Code Review
Browse files

Merge "Keyguard was hiding occluding activities" into tm-dev

parents ab4b27e0 7a2abccf

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

+6 −1
Original line number Diff line number Diff line
@@ -2921,8 +2921,9 @@ public class StatusBar extends CoreStartable implements 
        // turned off fully.

        boolean keyguardForDozing = mDozeServiceHost.getDozingRequested()

                && (!mDeviceInteractive || isGoingToSleep() && (isScreenFullyOff() || mIsKeyguard));

        boolean isWakingAndOccluded = isOccluded() && isWaking();

        boolean shouldBeKeyguard = (mStatusBarStateController.isKeyguardRequested()

                || keyguardForDozing) && !wakeAndUnlocking;

                || keyguardForDozing) && !wakeAndUnlocking && !isWakingAndOccluded;

        if (keyguardForDozing) {

            updatePanelExpansionForKeyguard();

        }
@@ -3732,6 +3733,10 @@ public class StatusBar extends CoreStartable implements 
                == WakefulnessLifecycle.WAKEFULNESS_GOING_TO_SLEEP;

    }



    boolean isWaking() {

        return mWakefulnessLifecycle.getWakefulness() == WakefulnessLifecycle.WAKEFULNESS_WAKING;

    }



    public void notifyBiometricAuthModeChanged() {

        mDozeServiceHost.updateDozing();

        updateScrimController();