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

am f009e358: Merge "Fix blank lockscreen #3" into lmp-dev

Browse Source 
* commit 'f009e3583f2843a463d75f06675ef18c398b0efd':
  Fix blank lockscreen #3
This commit is contained in:
Jorim Jaggi
2014-10-03 23:53:09 +00:00
committed by Android Git Automerger
parent 9da6e74359 f009e3583f
commit a359df01e0
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() { public void animateCollapseQuickSettings() {
mStatusBarView.collapseAllPanels(true); if (mState == StatusBarState.SHADE) {
mStatusBarView.collapseAllPanels(true);
}
} }
void makeExpandedInvisible() { void makeExpandedInvisible() {
@@ -2474,7 +2476,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
&& mStatusBarWindowState != state) { && mStatusBarWindowState != state) {
mStatusBarWindowState = state; mStatusBarWindowState = state;
if (DEBUG_WINDOW_STATE) Log.d(TAG, "Status bar " + windowStateToString(state)); if (DEBUG_WINDOW_STATE) Log.d(TAG, "Status bar " + windowStateToString(state));
if (!showing) { if (!showing && mState == StatusBarState.SHADE) {
mStatusBarView.collapseAllPanels(false); mStatusBarView.collapseAllPanels(false);
} }
} }