From f50e88227d30c96e33b6bdb9863f8f15a0f8ae42 Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Wed, 1 Jun 2016 11:19:26 -0400
Subject: 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
---
 .../src/com/android/systemui/statusbar/phone/NotificationPanelView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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();
-- 
cgit v1.2.3-59-g8ed1b