Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix status bar showing on lock screen on boot"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-02-14 22:34:19 +00:00
committed by Android (Google) Code Review
parent b454cb8842 1e5ba5d087
commit e4a2476ea9
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
View File

@@ -164,15 +164,19 @@ 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() {
synchronized (mLock) {
mHandler.removeMessages(MSG_EXPAND_NOTIFICATIONS);
@@ -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:

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

@@ -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() {