am a359df01: am f009e358: Merge "Fix blank lockscreen #3" into lmp-dev (85701394) · Commits · e / os / android_frameworks_base

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -2372,8 +2372,10 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		}

		public void animateCollapseQuickSettings() {
		if (mState == StatusBarState.SHADE) {
		mStatusBarView.collapseAllPanels(true);
		}
		}

		void makeExpandedInvisible() {
		if (SPEW) Log.d(TAG, "makeExpandedInvisible: mExpandedVisible=" + mExpandedVisible
		@@ -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);
		}
		}