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

Commit f732e37c authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

Merge "If the panels are disabled, don't go opaque on interaction." into klp-dev

parents 881e1a6b 3d7e0958

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

+6 −2
Original line number Diff line number Diff line
@@ -1928,8 +1928,12 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode { 


    private void checkBarModes() {

        if (mDemoMode) return;

        checkBarMode((mInteractingWindows & StatusBarManager.WINDOW_STATUS_BAR) != 0 ? MODE_OPAQUE

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

        int sbMode = mStatusBarMode;

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

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

            sbMode = MODE_OPAQUE;

        }

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

        if (mNavigationBarView != null) {

            checkBarMode(mNavigationBarMode,

                    mNavigationBarWindowState, mNavigationBarView.getBarTransitions());