Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ada1bfa authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge "Ensure that setVisibility is the" into tm-qpr-dev am: 453faac2 am:... 

Merge "Ensure that setVisibility is the" into tm-qpr-dev am: 453faac2 am: cfdc4ea3 am: 58b6b910 am: 951798e1

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



Change-Id: I93eb3089be7de1beb3aedfa037c5908b0d1a130d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4574ed11 951798e1

packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBouncerViewBinder.kt

+1 −2
Original line number Diff line number Diff line
@@ -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

                                    )
@@ -128,7 +128,6 @@ object KeyguardBouncerViewBinder { 
                                    )

                                }

                            } else {

                                view.visibility = View.INVISIBLE

                                securityContainerController.onBouncerVisibilityChanged(

                                    /* isVisible= */ false

                                )