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

Commit 1e5ba5d0 authored by Jason Monk's avatar Jason Monk
Browse files

Fix status bar showing on lock screen on boot 

Fix dispatching of disables through StatusBar.

Change-Id: Iee5e5d8cdf64f06b28986ff599aa3479c712980f
Fixes: 35200453
Test: visual
parent 69f42ecb

packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java

+7 −3
Original line number Diff line number Diff line
@@ -164,13 +164,17 @@ public class CommandQueue extends IStatusBar.Stub { 
        }

    }



    public void disable(int state1, int state2) {

    public void disable(int state1, int state2, boolean animate) {

        synchronized (mLock) {

            mDisable1 = state1;

            mDisable2 = state2;

            mHandler.removeMessages(MSG_DISABLE);

            mHandler.obtainMessage(MSG_DISABLE, state1, state2, null).sendToTarget();

            mHandler.obtainMessage(MSG_DISABLE, state1, state2, animate).sendToTarget();

        }

    }



    public void disable(int state1, int state2) {

        disable(state1, state2, true);

    }



    public void animateExpandNotificationsPanel() {
@@ -433,7 +437,7 @@ public class CommandQueue extends IStatusBar.Stub { 
                }

                case MSG_DISABLE:

                    for (int i = 0; i < mCallbacks.size(); i++) {

                        mCallbacks.get(i).disable(msg.arg1, msg.arg2, true /* animate */);

                        mCallbacks.get(i).disable(msg.arg1, msg.arg2, (Boolean) msg.obj);

                    }

                    break;

                case MSG_EXPAND_NOTIFICATIONS:

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

+2 −2
Original line number Diff line number Diff line
@@ -838,7 +838,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
        createAndAddWindows();



        mSettingsObserver.onChange(false); // set up

        disable(switches[0], switches[6], false /* animate */);

        mCommandQueue.disable(switches[0], switches[6], false /* animate */);

        setSystemUiVisibility(switches[1], switches[7], switches[8], 0xffffffff,

                fullscreenStackBounds, dockedStackBounds);

        topAppWindowChanged(switches[2] != 0);
@@ -2510,7 +2510,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
     * This needs to be called if state used by {@link #adjustDisableFlags} changes.

     */

    public void recomputeDisableFlags(boolean animate) {

        disable(mDisabledUnmodified1, mDisabledUnmodified2, animate);

        mCommandQueue.disable(mDisabledUnmodified1, mDisabledUnmodified2, animate);

    }



    protected H createHandler() {