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

Commit fd537821 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android Git Automerger
Browse files

am 41ecb84d: Merge "Don\'t force black status bar when expanded." 

* commit '41ecb84d7ca1995fe020e8c2d3e6bb98edde37b6':
  Don't force black status bar when expanded.
parents a62a54ff 7b511853

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

+1 −7
Original line number Original line Diff line number Diff line
@@ -1869,13 +1869,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 




    private void checkBarModes() {

    private void checkBarModes() {

        if (mDemoMode) return;

        if (mDemoMode) return;

        int sbMode = mStatusBarMode;

        checkBarMode(mStatusBarMode, mStatusBarWindowState, mStatusBarView.getBarTransitions());

        if (panelsEnabled() && (mInteractingWindows & StatusBarManager.WINDOW_STATUS_BAR) != 0

                && mState != StatusBarState.KEYGUARD) {

            // if panels are expandable, force the status bar opaque on any interaction

            sbMode = MODE_OPAQUE;

        }

        checkBarMode(sbMode, mStatusBarWindowState, mStatusBarView.getBarTransitions());

        if (mNavigationBarView != null) {

        if (mNavigationBarView != null) {

            checkBarMode(mNavigationBarMode,

            checkBarMode(mNavigationBarMode,

                    mNavigationBarWindowState, mNavigationBarView.getBarTransitions());

                    mNavigationBarWindowState, mNavigationBarView.getBarTransitions());