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

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

Change-Id: Ib107990b53722aefeb49a1f0b70ac5cc8c619db6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bill Lin
2023-05-22 18:19:53 +00:00
committed by Automerger Merge Worker

View File

@@ -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
headerTopBounds -= iconView.bottom.coerceAtMost(bottomInset)
if (descriptionView.bottom > bottomInset) {
if (descriptionView.bottom > headerBottomBounds) {
headerTopBounds -= iconView.bottom.coerceAtMost(bottomInset)
credentialHeader.layout(left, headerTopBounds, headerRightBound, bottom)
}
} else {