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

Commit 76f44aed authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

Merge "Correctly apply scrollY" into sc-v2-dev am: 7bced578 am: 564b84d4 

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

Change-Id: Ibc78c6d8937b77a318e79a8d89942a962856f907
parents 66664257 564b84d4

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

+3 −3
Original line number Diff line number Diff line
@@ -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

    }