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

Merge "Fix Y icon positioning when prompt fields are empty." into udc-d1-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-06-08 22:23:40 +00:00
committed by Android (Google) Code Review
parent 5cf733c374 1dcbf03d53
commit eb68481407
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/SystemUI/src/com/android/systemui/biometrics/ui/binder/BiometricViewSizeBinder.kt
View File

@@ -28,6 +28,7 @@ import android.view.accessibility.AccessibilityManager
import android.widget.TextView import android.widget.TextView
import androidx.core.animation.addListener import androidx.core.animation.addListener
import androidx.core.view.doOnLayout import androidx.core.view.doOnLayout
import androidx.core.view.isGone
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.android.systemui.R import com.android.systemui.R
import com.android.systemui.biometrics.AuthDialog import com.android.systemui.biometrics.AuthDialog
@@ -78,9 +79,11 @@ object BiometricViewSizeBinder {
// cache the original position of the icon view (as done in legacy view) // cache the original position of the icon view (as done in legacy view)
// this must happen before any size changes can be made // this must happen before any size changes can be made
var iconHolderOriginalY = 0f
view.doOnLayout { view.doOnLayout {
iconHolderOriginalY = iconHolderView.y // TODO(b/251476085): this old way of positioning has proven itself unreliable
// remove this and associated thing like (UdfpsDialogMeasureAdapter) and
// pin to the physical sensor
val iconHolderOriginalY = iconHolderView.y
// bind to prompt // bind to prompt
// TODO(b/251476085): migrate the legacy panel controller and simplify this // TODO(b/251476085): migrate the legacy panel controller and simplify this
@@ -141,7 +144,11 @@ object BiometricViewSizeBinder {
listOf( listOf(
iconHolderView.asVerticalAnimator( iconHolderView.asVerticalAnimator(
duration = duration.toLong(), duration = duration.toLong(),
toY = iconHolderOriginalY, toY =
iconHolderOriginalY -
viewsToHideWhenSmall
.filter { it.isGone }
.sumOf { it.height },
), ),
viewsToFadeInOnSizeChange.asFadeInAnimator( viewsToFadeInOnSizeChange.asFadeInAnimator(
duration = duration.toLong(), duration = duration.toLong(),