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

Commit e6164e4e authored by Bill Lin's avatar Bill Lin Committed by Automerger Merge Worker
Browse files

Merge "Only offset header icon when description is possible to overlap... 

Merge "Only offset header icon when description is possible to overlap keyboard" into udc-dev am: d86324d3

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



Change-Id: Ic83cd6c2f88ab9e5df855462fc9ecdbf36e872d3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 04023cb2 d86324d3

packages/SystemUI/src/com/android/systemui/biometrics/ui/CredentialPasswordView.kt

+3 −3
Original line number Diff line number Diff line
@@ -68,15 +68,15 @@ class CredentialPasswordView(context: Context, attrs: AttributeSet?) : 
        var inputTopBound: Int

        var headerRightBound = right

        var headerTopBounds = top

        var headerBottomBounds = bottom

        val subTitleBottom: Int = if (subtitleView.isGone) titleView.bottom else subtitleView.bottom

        val descBottom = if (descriptionView.isGone) subTitleBottom else descriptionView.bottom

        if (resources.configuration.orientation == ORIENTATION_LANDSCAPE) {

            inputTopBound = (bottom - credentialInput.height) / 2

            inputLeftBound = (right - left) / 2

            headerRightBound = inputLeftBound

            if (descriptionView.bottom > headerBottomBounds) {

                headerTopBounds -= iconView.bottom.coerceAtMost(bottomInset)



            if (descriptionView.bottom > bottomInset) {

                credentialHeader.layout(left, headerTopBounds, headerRightBound, bottom)

            }

        } else {