diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java index 496219996b74..6ae09b02fe5e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java @@ -160,7 +160,7 @@ public class PanelBar extends FrameLayout { } } if (DEBUG) LOG("collapseAllPanels: animate=%s waiting=%s", animate, waiting); - if (!waiting) { + if (!waiting && mState != STATE_CLOSED) { // it's possible that nothing animated, so we replicate the termination // conditions of panelExpansionChanged here go(STATE_CLOSED); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index e5874221fb5e..3aa81ea6b8d0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -1269,8 +1269,8 @@ public class PhoneStatusBar extends BaseStatusBar { return; } - // Ensure the panel is fully collapsed (just in case; bug 6765842) - // @@@ mStatusBarView.collapseAllPanels(/*animate=*/ false); + // Ensure the panel is fully collapsed (just in case; bug 6765842, 7260868) + mStatusBarView.collapseAllPanels(/*animate=*/ false); mExpandedVisible = false; mPile.setLayoutTransitionsEnabled(false); |