Merge "Correctly apply scrollY" into sc-v2-dev

2021-11-03 15:01:11 +00:00
parent 9145f4a488 92097fc4a4
commit 7bced578b7
1 changed files with 3 additions and 3 deletions
--- a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileViewImpl.kt
@@ -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
    }