Merge "QS: Fix expanding on closing detail" into nyc-mr1-dev

2016-08-08 15:32:23 +00:00
parent 295d81c360 dfb851c6cf
commit a6ab28d3c9
1 changed files with 3 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/qs/QSContainer.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSContainer.java
@@ -146,7 +146,9 @@ public class QSContainer extends FrameLayout {
            return getHeight();
        }
        if (mQSDetail.isClosingDetail()) {
-            return mQSPanel.getGridHeight() + mHeader.getCollapsedHeight() + getPaddingBottom();
+            int panelHeight = ((LayoutParams) mQSPanel.getLayoutParams()).topMargin
+                    + mQSPanel.getMeasuredHeight();
+            return panelHeight + getPaddingBottom();
        } else {
            return getMeasuredHeight();
        }