summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Aaron Liu <aaronjli@google.com> 2023-04-03 20:58:06 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-04-03 20:58:06 +0000
commitcfdc4ea3b2468fa1728ec60c9324f0d6cd231c93 (patch)
tree9234c95b3f4c2361202d8071ad80ede1b08559d8
parentd1b7ec6bf80695c23676ea0603db08367a45e41f (diff)
parent453faac20fa70700ee5c56d04afba2a57fe1c0d4 (diff)
Merge "Ensure that setVisibility is the" into tm-qpr-dev am: 453faac20f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22357879 Change-Id: Ideff48a0431872cba3121d78652b71729f76ac01 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBouncerViewBinder.kt3
1 files changed, 1 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBouncerViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBouncerViewBinder.kt
index 468a6b52c5e5..fc0e6cb1a63b 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBouncerViewBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBouncerViewBinder.kt
@@ -110,11 +110,11 @@ object KeyguardBouncerViewBinder {
viewModel.setBouncerViewDelegate(delegate)
launch {
viewModel.isShowing.collect { isShowing ->
+ view.visibility = if (isShowing) View.VISIBLE else View.INVISIBLE
if (isShowing) {
// Reset Security Container entirely.
securityContainerController.reinflateViewFlipper {
// Reset Security Container entirely.
- view.visibility = View.VISIBLE
securityContainerController.onBouncerVisibilityChanged(
/* isVisible= */ true
)
@@ -127,7 +127,6 @@ object KeyguardBouncerViewBinder {
)
}
} else {
- view.visibility = View.INVISIBLE
securityContainerController.onBouncerVisibilityChanged(
/* isVisible= */ false
)