Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-12 22:21:32 +00:00
committed by Android (Google) Code Review
parent 3009a4d87d 1b69a1d33e
commit 4d2b82b01f
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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)
}
}
}
}