Merge "Ensure that setVisibility is the" into tm-qpr-dev am: 453faac20f am: cfdc4ea3b2 am: 58b6b91014

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

Change-Id: I391a2437cfd285d31d95eab1f60642538f90d67b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Aaron Liu
2023-04-03 21:44:13 +00:00
committed by Automerger Merge Worker

View File

@@ -110,11 +110,11 @@ object KeyguardBouncerViewBinder {
viewModel.setBouncerViewDelegate(delegate) viewModel.setBouncerViewDelegate(delegate)
launch { launch {
viewModel.isShowing.collect { isShowing -> viewModel.isShowing.collect { isShowing ->
view.visibility = if (isShowing) View.VISIBLE else View.INVISIBLE
if (isShowing) { if (isShowing) {
// Reset Security Container entirely. // Reset Security Container entirely.
securityContainerController.reinflateViewFlipper { securityContainerController.reinflateViewFlipper {
// Reset Security Container entirely. // Reset Security Container entirely.
view.visibility = View.VISIBLE
securityContainerController.onBouncerVisibilityChanged( securityContainerController.onBouncerVisibilityChanged(
/* isVisible= */ true /* isVisible= */ true
) )
@@ -128,7 +128,6 @@ object KeyguardBouncerViewBinder {
) )
} }
} else { } else {
view.visibility = View.INVISIBLE
securityContainerController.onBouncerVisibilityChanged( securityContainerController.onBouncerVisibilityChanged(
/* isVisible= */ false /* isVisible= */ false
) )