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

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

Browse Source
This commit is contained in:
Daniel Sandler
2012-10-05 09:56:37 -07:00
committed by Android (Google) Code Review
parent d7620196e5 c38bbc391a
commit 5b5d31b19b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);

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

@@ -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);