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

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

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

Change-Id: I6cecf5893f6dbf75c1938b85ee7060e9fde1b7bc
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:06 +00:00
committed by Automerger Merge Worker
parent b760ddc161 d86324d3d3
commit 680f93a21c
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/biometrics/ui/CredentialPasswordView.kt
View File

@@ -68,15 +68,15 @@ class CredentialPasswordView(context: Context, attrs: AttributeSet?) :
var inputTopBound: Int var inputTopBound: Int
var headerRightBound = right var headerRightBound = right
var headerTopBounds = top var headerTopBounds = top
var headerBottomBounds = bottom
val subTitleBottom: Int = if (subtitleView.isGone) titleView.bottom else subtitleView.bottom val subTitleBottom: Int = if (subtitleView.isGone) titleView.bottom else subtitleView.bottom
val descBottom = if (descriptionView.isGone) subTitleBottom else descriptionView.bottom val descBottom = if (descriptionView.isGone) subTitleBottom else descriptionView.bottom
if (resources.configuration.orientation == ORIENTATION_LANDSCAPE) { if (resources.configuration.orientation == ORIENTATION_LANDSCAPE) {
inputTopBound = (bottom - credentialInput.height) / 2 inputTopBound = (bottom - credentialInput.height) / 2
inputLeftBound = (right - left) / 2 inputLeftBound = (right - left) / 2
headerRightBound = inputLeftBound headerRightBound = inputLeftBound
headerTopBounds -= iconView.bottom.coerceAtMost(bottomInset) if (descriptionView.bottom > headerBottomBounds) {
headerTopBounds -= iconView.bottom.coerceAtMost(bottomInset)
if (descriptionView.bottom > bottomInset) {
credentialHeader.layout(left, headerTopBounds, headerRightBound, bottom) credentialHeader.layout(left, headerTopBounds, headerRightBound, bottom)
} }
} else { } else {