diff options
| author | 2016-10-11 19:14:29 +0000 | |
|---|---|---|
| committer | 2016-10-11 19:14:29 +0000 | |
| commit | cd8c71a8d1273c230a985a632fecc5fa81b45275 (patch) | |
| tree | 23e0af4e9486a2575522ae154e098066eee34ee6 | |
| parent | a1dca8483ab1b58d2a62fb558d1be10918a7d2be (diff) | |
| parent | b92a21d688517261fed8343daade898a4862efda (diff) | |
Fixed a bug where the header would flicker weirdly when replying am: 5f2ca6b1a1
am: b92a21d688
Change-Id: I7de88401225d49be9298ff42eb6ccabd6418fca5
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/QSContainer.java | 5 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSContainer.java b/packages/SystemUI/src/com/android/systemui/qs/QSContainer.java index 19a5d522f530..2b28fe65b22c 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSContainer.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSContainer.java @@ -320,4 +320,9 @@ public class QSContainer extends FrameLayout { public int getQsMinExpansionHeight() { return mHeader.getHeight(); } + + public void hideImmediately() { + animate().cancel(); + setY(-mHeader.getHeight()); + } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java index 1cf7a23e6b40..ede6fd08dd26 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -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) { |