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

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

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

Change-Id: Idee9f7b1a58b071991eb951bd10d774b2e34559f
This commit is contained in:
Lucas Dupin
2021-11-03 15:17:47 +00:00
committed by Automerger Merge Worker
parent 29d56c1b3c 7bced578b7
commit 564b84d4ab
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt
View File

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