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

Commit 26750711 authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "Explicitly specify user for public mode" into lmp-mr1-dev

parents b90a2f9d 31b844ba

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

+2 −1
Original line number Diff line number Diff line
@@ -3183,6 +3183,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
    public void userSwitched(int newUserId) {

        if (MULTIUSER_DEBUG) mNotificationPanelDebugText.setText("USER " + newUserId);

        animateCollapsePanels();

        updatePublicMode();

        updateNotifications();

        resetUserSetupObserver();

        setControllerUsers();
@@ -3674,7 +3675,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 


    private void updatePublicMode() {

        setLockscreenPublicMode(mStatusBarKeyguardViewManager.isShowing()

                && mStatusBarKeyguardViewManager.isSecure());

                && mStatusBarKeyguardViewManager.isSecure(mCurrentUserId));

    }



    private void updateKeyguardState(boolean goingToFullShade, boolean fromShadeLocked) {

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

+4 −0
Original line number Diff line number Diff line
@@ -426,4 +426,8 @@ public class StatusBarKeyguardViewManager { 
    public boolean isGoingToNotificationShade() {

        return mPhoneStatusBar.isGoingToNotificationShade();

    }



    public boolean isSecure(int userId) {

        return mBouncer.isSecure() || mLockPatternUtils.isSecure(userId);

    }

}