summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jason Monk <jmonk@google.com> 2016-06-01 11:19:26 -0400
committer Jason Monk <jmonk@google.com> 2016-06-01 11:19:26 -0400
commitf50e88227d30c96e33b6bdb9863f8f15a0f8ae42 (patch)
tree5f087522a809208d11749aa9f681e4d97339e6c9
parente19cc141c388c7190a1582f0ee72c9ba67569a2d (diff)
QS: Fix single expanded frame from layout
During animation it was resetting the QS expansion on layout which made a frame of fully expanded appear. Bug: 28008271 Change-Id: I6ac44cb918bdf53da0653332eabf0f4e96779cff
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java2
1 files changed, 1 insertions, 1 deletions
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 522f2502e256..5064d8eb1d4c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -1735,7 +1735,7 @@ public class NotificationPanelView extends PanelView implements
public void onQsHeightChanged() {
mQsMaxExpansionHeight = mQsContainer.getDesiredHeight();
- if (mQsExpanded) {
+ if (mQsExpanded && mQsFullyExpanded) {
mQsExpansionHeight = mQsMaxExpansionHeight;
requestScrollerTopPaddingUpdate(false /* animate */);
requestPanelHeightUpdate();