Merge "Correctly apply scrollY" into sc-v2-dev am: 7bced578b7 am: 564b84d4ab

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

Change-Id: Ibc78c6d8937b77a318e79a8d89942a962856f907
This commit is contained in:
Lucas Dupin
2021-11-03 15:33:56 +00:00
committed by Automerger Merge Worker

View File

@@ -242,12 +242,12 @@ open class QSTileViewImpl @JvmOverloads constructor(
}
private fun updateHeight() {
val actualHeight = (if (heightOverride != HeightOverrideable.NO_OVERRIDE) {
val actualHeight = if (heightOverride != HeightOverrideable.NO_OVERRIDE) {
heightOverride
} else {
measuredHeight
} * squishinessFraction).toInt()
bottom = top + actualHeight
}
bottom = top + (actualHeight * squishinessFraction).toInt()
scrollY = (actualHeight - height) / 2
}