Fixed a bug where the header would flicker weirdly when replying am: 5f2ca6b1a1 am: b92a21d688

am: cd8c71a8d1

Change-Id: Iec9b7ad1013824187a24ad66c0f54011869009fd
This commit is contained in:
Selim Cinek
2016-10-11 19:26:42 +00:00
committed by android-build-merger
2 changed files with 8 additions and 2 deletions

View File

@@ -334,4 +334,9 @@ public class QSContainerImpl extends QSContainer {
public int getQsMinExpansionHeight() {
return mHeader.getHeight();
}
public void hideImmediately() {
animate().cancel();
setY(-mHeader.getHeight());
}
}

View File

@@ -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) {