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

Commit 25ab3d94 authored by Adrian Roos's avatar Adrian Roos
Browse files

Fix broken status bar when activity is showing above keyguard

Bug: 14077213
Change-Id: I5d45fd1780498983995a469d0799e024ca25f3c7
parent 33ac0dfc
Loading
Loading
Loading
Loading
+12 −2
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ public class StatusBarKeyguardViewManager {
    private boolean mScreenOn = false;
    private KeyguardBouncer mBouncer;
    private boolean mShowing;
    private boolean mOccluded = false;

    public StatusBarKeyguardViewManager(Context context, ViewMediatorCallback callback,
            LockPatternUtils lockPatternUtils) {
@@ -102,9 +103,11 @@ public class StatusBarKeyguardViewManager {
    }

    public void showBouncer() {
        if (!mOccluded) {
            mBouncer.show();
            updateBackButtonState();
        }
    }

    /**
     * Reset the state of the view.
@@ -152,6 +155,13 @@ public class StatusBarKeyguardViewManager {
    }

    public void setOccluded(boolean occluded) {
        mOccluded = occluded;
        if (occluded) {
            mPhoneStatusBar.hideKeyguard();
            mBouncer.hide();
        } else {
            showBouncerOrKeyguard();
        }
        mStatusBarWindowManager.setKeyguardOccluded(occluded);
    }