Merge "QS: Fix single expanded frame from layout" into nyc-dev

2016-06-01 17:26:52 +00:00
parent 1ceef7c0fa f50e88227d
commit 4215ae0100
1 changed files with 1 additions and 1 deletions
--- 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();