Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61af4a30 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Do not ignore views that are GONE" into sc-dev am: 4d2b82b0 am: 7c8d2d78 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14521253

Change-Id: Ifa9604bbbbb5cc58ea06abed48dc5e3c201dfb5e
parents d0913f56 7c8d2d78

packages/SystemUI/src/com/android/systemui/qs/tileimpl/IgnorableChildLinearLayout.kt

+9 −7
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ class IgnorableChildLinearLayout @JvmOverloads constructor( 
        super.onMeasure(widthMeasureSpec, heightMeasureSpec)

        if (ignoreLastView && childCount > 0) {

            val lastView = getChildAt(childCount - 1)

            if (lastView.visibility != GONE) {

                val lp = lastView.layoutParams as MarginLayoutParams

                if (orientation == VERTICAL) {

                    val height = lastView.measuredHeight + lp.bottomMargin + lp.topMargin
@@ -56,3 +57,4 @@ class IgnorableChildLinearLayout @JvmOverloads constructor( 
            }

        }

    }

}
 
 No newline at end of file