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

Merge "Fix blank lockscreen #3" into lmp-dev

Browse Source
This commit is contained in:
Jorim Jaggi
2014-10-03 22:33:05 +00:00
committed by Android (Google) Code Review
parent d988a45d60 449981be16
commit f009e3583f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2372,7 +2372,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
}
public void animateCollapseQuickSettings() {
mStatusBarView.collapseAllPanels(true);
if (mState == StatusBarState.SHADE) {
mStatusBarView.collapseAllPanels(true);
}
}
void makeExpandedInvisible() {
@@ -2474,7 +2476,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
&& mStatusBarWindowState != state) {
mStatusBarWindowState = state;
if (DEBUG_WINDOW_STATE) Log.d(TAG, "Status bar " + windowStateToString(state));
if (!showing) {
if (!showing && mState == StatusBarState.SHADE) {
mStatusBarView.collapseAllPanels(false);
}
}