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

Commit ec0dae91 authored by Dan Sandler's avatar Dan Sandler Committed by The Android Automerger
Browse files

Don't show notifications above FLAG_SHOW_WHEN_LOCKED windows. 

We need to hide the bouncer when the lockscreen is occluded
by a show-when-locked window, but we also need to double-check
any time the screen comes on in case the bouncer has been
shown for some other reason since the occlusion originally
happened.

Bug: 14294001
Change-Id: Ief4ea8e39322d9c4b26ec217dbc14b6c6f16ad45
parent 42eab1b7

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

+11 −3
Original line number Diff line number Diff line
@@ -95,7 +95,9 @@ public class StatusBarKeyguardViewManager { 
    }



    private void showBouncer() {

        if (!mOccluded) {

            mBouncer.show();

        }

        updateStates();

    }
@@ -103,7 +105,12 @@ public class StatusBarKeyguardViewManager { 
     * Reset the state of the view.

     */

    public void reset() {

        if (mOccluded) {

            mPhoneStatusBar.hideKeyguard();

            mBouncer.hide();

        } else {

            showBouncerOrKeyguard();

        }

        updateStates();

    }
@@ -114,6 +121,7 @@ public class StatusBarKeyguardViewManager { 


    public void onScreenTurnedOn(final IKeyguardShowCallback callback) {

        mScreenOn = true;

        reset();

        if (callback != null) {

            callbackAfterDraw(callback);

        }
@@ -147,7 +155,7 @@ public class StatusBarKeyguardViewManager { 
    public void setOccluded(boolean occluded) {

        mOccluded = occluded;

        mStatusBarWindowManager.setKeyguardOccluded(occluded);

        updateStates();

        reset();

    }



    /**