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

Commit 5c75b5b6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Hide windows even when AOD is off" into pi-dev

parents 6dc57344 c29b146d

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+3 −0
Original line number Diff line number Diff line
@@ -2107,6 +2107,9 @@ public class KeyguardViewMediator extends SystemUI { 
        pw.print("  mDrawnCallback: "); pw.println(mDrawnCallback);

    }



    /**

     * @param aodShowing true when AOD - or ambient mode - is showing.

     */

    public void setAodShowing(boolean aodShowing) {

        setShowingLocked(mShowing, aodShowing);

    }

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

+1 −2
Original line number Diff line number Diff line
@@ -4719,7 +4719,6 @@ public class StatusBar extends SystemUI implements DemoMode, 
        boolean dozing = mDozingRequested && mState == StatusBarState.KEYGUARD

                || mFingerprintUnlockController.getMode()

                        == FingerprintUnlockController.MODE_WAKE_AND_UNLOCK_PULSING;

        final boolean alwaysOn = DozeParameters.getInstance(mContext).getAlwaysOn();

        // When in wake-and-unlock we may not have received a change to mState

        // but we still should not be dozing, manually set to false.

        if (mFingerprintUnlockController.getMode() ==
@@ -4728,7 +4727,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
        }

        if (mDozing != dozing) {

            mDozing = dozing;

            mKeyguardViewMediator.setAodShowing(mDozing && alwaysOn);

            mKeyguardViewMediator.setAodShowing(mDozing);

            mStatusBarWindowManager.setDozing(mDozing);

            mStatusBarKeyguardViewManager.setDozing(mDozing);

            if (mAmbientIndicationContainer instanceof DozeReceiver) {