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

am: b92a21d688

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

View File

@@ -320,4 +320,9 @@ public class QSContainer extends FrameLayout {
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) {