Merge "Lubricate a sticky notification panel." into jb-mr1-dev

Author: dsandler

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

@@ -160,7 +160,7 @@ public void collapseAllPanels(boolean animate) {
             }
         }
         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);

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

@@ -1269,8 +1269,8 @@ void makeExpandedInvisible() {
             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);