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

Commit ed50e94d authored by Dan Sandler's avatar Dan Sandler Committed by Android Git Automerger
Browse files

am 4ccaa092: Merge "Don\'t show private notifications if a secure lockscreen... 

am 4ccaa092: Merge "Don\'t show private notifications if a secure lockscreen is merely occluded." into lmp-preview-dev

* commit '4ccaa092d49deb84885b5daf2e6d6f1c745d56bf':
  Don't show private notifications if a secure lockscreen is merely occluded.
parents 6be08229 71f507bb

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

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



    private void updatePublicMode() {

        setLockscreenPublicMode(mState == StatusBarState.KEYGUARD

        setLockscreenPublicMode(

                (mStatusBarKeyguardViewManager.isShowing() || 

                    mStatusBarKeyguardViewManager.isOccluded())

                && mStatusBarKeyguardViewManager.isSecure());

    }

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

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

    }



    public boolean isOccluded() {

        return mOccluded;

    }



    /**

     * Hides the keyguard view

     */