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

Commit e1ad6f88 authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "Keyguard was hiding occluding activities" into tm-dev am: 3def39d3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16986885

Change-Id: Ia3c7899756b139937d69de87c3b243b5f2e9d83f
parents fe50a687 3def39d3

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

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

        // turned off fully.

        boolean keyguardForDozing = mDozeServiceHost.getDozingRequested()

        boolean keyguardForDozing = mDozeServiceHost.getDozingRequested()

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

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

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

        boolean shouldBeKeyguard = (mStatusBarStateController.isKeyguardRequested()

        boolean shouldBeKeyguard = (mStatusBarStateController.isKeyguardRequested()

                || keyguardForDozing) && !wakeAndUnlocking;

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

        if (keyguardForDozing) {

        if (keyguardForDozing) {

            updatePanelExpansionForKeyguard();

            updatePanelExpansionForKeyguard();

        }

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

                == WakefulnessLifecycle.WAKEFULNESS_GOING_TO_SLEEP;

    }

    }





    boolean isWaking() {

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

    }



    public void notifyBiometricAuthModeChanged() {

    public void notifyBiometricAuthModeChanged() {

        mDozeServiceHost.updateDozing();

        mDozeServiceHost.updateDozing();

        updateScrimController();

        updateScrimController();