Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9a4eef7 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

am 42d696f6: am 5a824f4b: am 5b5d31b1: Merge "Lubricate a sticky notification... 

am 42d696f6: am 5a824f4b: am 5b5d31b1: Merge "Lubricate a sticky notification panel." into jb-mr1-dev

* commit '42d696f6':
  Lubricate a sticky notification panel.
parents 7a03775e 42d696f6

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

+1 −1
Original line number Diff line number Diff line
@@ -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);

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

+2 −2
Original line number Diff line number Diff line
@@ -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);