Merge "Fixed a bug where the header would flicker weirdly when replying" into nyc-mr1-dev (46d1ecbc) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/QSContainer.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -320,4 +320,9 @@ public class QSContainer extends FrameLayout {
		public int getQsMinExpansionHeight() {
		return mHeader.getHeight();
		}

		public void hideImmediately() {
		animate().cancel();
		setY(-mHeader.getHeight());
		}
		}

+3 −2

Original line number	Diff line number	Diff line
		@@ -1002,8 +1002,8 @@ public class NotificationPanelView extends PanelView implements
		mKeyguardShowing = keyguardShowing;
		mQsContainer.setKeyguardShowing(mKeyguardShowing);

		if (goingToFullShade \|\| (oldState == StatusBarState.KEYGUARD
		&& statusBarState == StatusBarState.SHADE_LOCKED)) {
		if (oldState == StatusBarState.KEYGUARD
		&& (goingToFullShade \|\| statusBarState == StatusBarState.SHADE_LOCKED)) {
		animateKeyguardStatusBarOut();
		long delay = mStatusBarState == StatusBarState.SHADE_LOCKED
		? 0 : mStatusBar.calculateGoingToFullShadeDelay();
		@@ -1017,6 +1017,7 @@ public class NotificationPanelView extends PanelView implements
		mKeyguardStatusBar.setVisibility(keyguardShowing ? View.VISIBLE : View.INVISIBLE);
		if (keyguardShowing && oldState != mStatusBarState) {
		mKeyguardBottomArea.onKeyguardShowingChanged();
		mQsContainer.hideImmediately();
		}
		}
		if (keyguardShowing) {