am 8570139: am a359df0: am f009e35: Merge "Fix blank lockscreen #3" i…

…nto lmp-dev * commit '85701394472bcc3c4c93e0d2780cb46047a9f712': Fix blank lockscreen #3
SlimRoms · Oct 4, 2014 · 5c9f098 · 5c9f098
2 parents c469479 + 8570139
commit 5c9f098
Showing 1 changed file with 4 additions and 2 deletions.
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);
             }
         }