Fixed a bug where the header would flicker weirdly when replying
am: 5f2ca6b1a1
Change-Id: Ie4e28561f91a6f3bdc84d9475660c7e72fd9a6ff
This commit is contained in:
@@ -320,4 +320,9 @@ public class QSContainer extends FrameLayout {
|
|||||||
public int getQsMinExpansionHeight() {
|
public int getQsMinExpansionHeight() {
|
||||||
return mHeader.getHeight();
|
return mHeader.getHeight();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void hideImmediately() {
|
||||||
|
animate().cancel();
|
||||||
|
setY(-mHeader.getHeight());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1002,8 +1002,8 @@ public class NotificationPanelView extends PanelView implements
|
|||||||
mKeyguardShowing = keyguardShowing;
|
mKeyguardShowing = keyguardShowing;
|
||||||
mQsContainer.setKeyguardShowing(mKeyguardShowing);
|
mQsContainer.setKeyguardShowing(mKeyguardShowing);
|
||||||
|
|
||||||
if (goingToFullShade || (oldState == StatusBarState.KEYGUARD
|
if (oldState == StatusBarState.KEYGUARD
|
||||||
&& statusBarState == StatusBarState.SHADE_LOCKED)) {
|
&& (goingToFullShade || statusBarState == StatusBarState.SHADE_LOCKED)) {
|
||||||
animateKeyguardStatusBarOut();
|
animateKeyguardStatusBarOut();
|
||||||
long delay = mStatusBarState == StatusBarState.SHADE_LOCKED
|
long delay = mStatusBarState == StatusBarState.SHADE_LOCKED
|
||||||
? 0 : mStatusBar.calculateGoingToFullShadeDelay();
|
? 0 : mStatusBar.calculateGoingToFullShadeDelay();
|
||||||
@@ -1017,6 +1017,7 @@ public class NotificationPanelView extends PanelView implements
|
|||||||
mKeyguardStatusBar.setVisibility(keyguardShowing ? View.VISIBLE : View.INVISIBLE);
|
mKeyguardStatusBar.setVisibility(keyguardShowing ? View.VISIBLE : View.INVISIBLE);
|
||||||
if (keyguardShowing && oldState != mStatusBarState) {
|
if (keyguardShowing && oldState != mStatusBarState) {
|
||||||
mKeyguardBottomArea.onKeyguardShowingChanged();
|
mKeyguardBottomArea.onKeyguardShowingChanged();
|
||||||
|
mQsContainer.hideImmediately();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (keyguardShowing) {
|
if (keyguardShowing) {
|
||||||
|
|||||||
Reference in New Issue
Block a user