Merge "Fix status bar showing on lock screen on boot" (e4a2476e) · Commits · e / os / android_frameworks_base

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:

+2 −2

Original line number	Diff line number	Diff line
		@@ -839,7 +839,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);
		@@ -2511,7 +2511,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() {