Skip to content

Commit c38bbc3

Browse files
committed
Lubricate a sticky notification panel.
If the panel was left open when the screen was turned off, in some cases it might get stuck in an "open" state (the panel's expanded height would be nonzero) although the status bar window is in fact fully collapsed (due to makeExpandedInvisible). The next time the user would go to open the panel, things would be in an inconsistent state and the panel wouldn't come down (on phones, the settings panel would be attempted, but still nothing would happen). This was easiest to reproduce on the keyguard (turn on screen, pull down panel, turn off screen). Bug: 7260868 Change-Id: Iec0000ba020e5a519eb5b4d42ac273b6689a18bd
1 parent a801f68 commit c38bbc3

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public void collapseAllPanels(boolean animate) {
160160
}
161161
}
162162
if (DEBUG) LOG("collapseAllPanels: animate=%s waiting=%s", animate, waiting);
163-
if (!waiting) {
163+
if (!waiting && mState != STATE_CLOSED) {
164164
// it's possible that nothing animated, so we replicate the termination
165165
// conditions of panelExpansionChanged here
166166
go(STATE_CLOSED);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1269,8 +1269,8 @@ void makeExpandedInvisible() {
12691269
return;
12701270
}
12711271

1272-
// Ensure the panel is fully collapsed (just in case; bug 6765842)
1273-
// @@@ mStatusBarView.collapseAllPanels(/*animate=*/ false);
1272+
// Ensure the panel is fully collapsed (just in case; bug 6765842, 7260868)
1273+
mStatusBarView.collapseAllPanels(/*animate=*/ false);
12741274

12751275
mExpandedVisible = false;
12761276
mPile.setLayoutTransitionsEnabled(false);

0 commit comments

Comments
 (0)