commit 1918842e10c2f90418cc5fcee787394da2bd6260
author Jorim Jaggi <jjaggi@google.com> Fri Oct 03 23:57:13 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 03 23:57:13 2014 +0000
tree b70df0bc1f54f18ff9623062a2c9c6a38b3e0a31
parent b0d6cd236ce84085c6f19955b4f4610d1a754411
parent f009e3583f2843a463d75f06675ef18c398b0efd

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

* commit 'f009e3583f2843a463d75f06675ef18c398b0efd':
  Fix blank lockscreen #3

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

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index d0f73b1..05d6001 100644
--- 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 animateCollapseQuickSettings() {
-        mStatusBarView.collapseAllPanels(true);
+        if (mState == StatusBarState.SHADE) {
+            mStatusBarView.collapseAllPanels(true);
+        }
     }
 
     void makeExpandedInvisible() {
@@ -2474,7 +2476,7 @@
                 && 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);
             }
         }