diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-10-03 22:33:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-03 22:33:06 +0000 |
| commit | f009e3583f2843a463d75f06675ef18c398b0efd (patch) | |
| tree | b8f3507170030bbc100f07dc2e9d2d2d44d3a013 /packages | |
| parent | d988a45d60cd2ff05e41a44c78cb09d307bd90cb (diff) | |
| parent | 449981be16ed0ecae1fe708c31ee25a93ec2ffae (diff) | |
| download | frameworks_base-f009e3583f2843a463d75f06675ef18c398b0efd.zip frameworks_base-f009e3583f2843a463d75f06675ef18c398b0efd.tar.gz frameworks_base-f009e3583f2843a463d75f06675ef18c398b0efd.tar.bz2 | |
Merge "Fix blank lockscreen #3" into lmp-dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 6 |
1 files changed, 4 insertions, 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 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 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); } } |