Merge "Do not ignore views that are GONE" into sc-dev

1 files changed, 9 insertions, 7 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/IgnorableChildLinearLayout.kt b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/IgnorableChildLinearLayout.kt
index 705576059b58..2bac29846893 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/IgnorableChildLinearLayout.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/IgnorableChildLinearLayout.kt
@@ -45,13 +45,15 @@ class IgnorableChildLinearLayout @JvmOverloads constructor(
         super.onMeasure(widthMeasureSpec, heightMeasureSpec)
         if (ignoreLastView && childCount > 0) {
             val lastView = getChildAt(childCount - 1)
-            val lp = lastView.layoutParams as MarginLayoutParams
-            if (orientation == VERTICAL) {
-                val height = lastView.measuredHeight + lp.bottomMargin + lp.topMargin
-                setMeasuredDimension(measuredWidth, measuredHeight - height)
-            } else {
-                val width = lastView.measuredWidth + lp.leftMargin + lp.rightMargin
-                setMeasuredDimension(measuredWidth - width, measuredHeight)
+            if (lastView.visibility != GONE) {
+                val lp = lastView.layoutParams as MarginLayoutParams
+                if (orientation == VERTICAL) {
+                    val height = lastView.measuredHeight + lp.bottomMargin + lp.topMargin
+                    setMeasuredDimension(measuredWidth, measuredHeight - height)
+                } else {
+                    val width = lastView.measuredWidth + lp.leftMargin + lp.rightMargin
+                    setMeasuredDimension(measuredWidth - width, measuredHeight)
+                }
             }
         }
     }