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

Commit 45d41eba authored by John Spurlock's avatar John Spurlock Committed by Android Git Automerger
Browse files

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

* commit 'f732e37c':
  If the panels are disabled, don't go opaque on interaction.
parents 7d3fb2d6 f732e37c
Loading
Loading
Loading
Loading
+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());