Merge "Attemp to fix blank lockscreen #2." (10c84f01) · Commits · e / os / android_frameworks_base

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

+5 −4

Original line number	Diff line number	Diff line
		@@ -1625,9 +1625,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {
		return (mDisabled & StatusBarManager.DISABLE_EXPAND) == 0;
		}

		void makeExpandedVisible() {
		void makeExpandedVisible(boolean force) {
		if (SPEW) Log.d(TAG, "Make expanded visible: expanded visible=" + mExpandedVisible);
		if (mExpandedVisible \|\| !panelsEnabled()) {
		if (!force && (mExpandedVisible \|\| !panelsEnabled())) {
		return;
		}

		@@ -3009,8 +3009,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {

		private void instantExpandNotificationsPanel() {

		// Make our window larger.
		mStatusBarWindowManager.setStatusBarExpanded(true);
		// Make our window larger and the panel visible.
		makeExpandedVisible(true);
		mNotificationPanel.setVisibility(View.VISIBLE);

		// Wait for window manager to pickup the change, so we know the maximum height of the panel
		// then.

+1 −1

Original line number	Diff line number	Diff line
		@@ -106,7 +106,7 @@ public class PhoneStatusBarView extends PanelBar {
		@Override
		public void onPanelPeeked() {
		super.onPanelPeeked();
		mBar.makeExpandedVisible();
		mBar.makeExpandedVisible(false);
		}

		@Override