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

Commit 71f507bb authored by Dan Sandler's avatar Dan Sandler Committed by Android (Google) Code Review
Browse files

Merge "Don't show private notifications if a secure lockscreen is merely... 

Merge "Don't show private notifications if a secure lockscreen is merely occluded." into lmp-preview-dev
parents 03b62b3c 4b22bdfa

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -2851,7 +2851,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
    }

    }





    private void updatePublicMode() {

    private void updatePublicMode() {

        setLockscreenPublicMode(mState == StatusBarState.KEYGUARD

        setLockscreenPublicMode(

                (mStatusBarKeyguardViewManager.isShowing() || 

                    mStatusBarKeyguardViewManager.isOccluded())

                && mStatusBarKeyguardViewManager.isSecure());

                && mStatusBarKeyguardViewManager.isSecure());

    }

    }

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -181,6 +181,10 @@ public class StatusBarKeyguardViewManager { 
        reset();

        reset();

    }

    }





    public boolean isOccluded() {

        return mOccluded;

    }



    /**

    /**

     * Hides the keyguard view

     * Hides the keyguard view

     */

     */