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

XSJoJo · Android (Google) Code Review · commit f009e3583f28 · 2014-10-03T22:33:06.000Z
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -2372,7 +2372,9 @@ public void animateExpandSettingsPanel() {
     }
 
     public void animateCollapseQuickSettings() {
-        mStatusBarView.collapseAllPanels(true);
+        if (mState == StatusBarState.SHADE) {
+            mStatusBarView.collapseAllPanels(true);
+        }
     }
 
     void makeExpandedInvisible() {
@@ -2474,7 +2476,7 @@ public void setWindowState(int window, int state) {
                 && 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);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -2372,7 +2372,9 @@ public void animateExpandSettingsPanel() {`
`2372`	`2372`	`}`
`2373`	`2373`
`2374`	`2374`	`public void animateCollapseQuickSettings() {`
`2375`		`- mStatusBarView.collapseAllPanels(true);`
	`2375`	`+ if (mState == StatusBarState.SHADE) {`
	`2376`	`+ mStatusBarView.collapseAllPanels(true);`
	`2377`	`+ }`
`2376`	`2378`	`}`
`2377`	`2379`
`2378`	`2380`	`void makeExpandedInvisible() {`
`@@ -2474,7 +2476,7 @@ public void setWindowState(int window, int state) {`
`2474`	`2476`	`&& mStatusBarWindowState != state) {`
`2475`	`2477`	`mStatusBarWindowState = state;`
`2476`	`2478`	`if (DEBUG_WINDOW_STATE) Log.d(TAG, "Status bar " + windowStateToString(state));`
`2477`		`- if (!showing) {`
	`2479`	`+ if (!showing && mState == StatusBarState.SHADE) {`
`2478`	`2480`	`mStatusBarView.collapseAllPanels(false);`
`2479`	`2481`	`}`
`2480`	`2482`	`}`