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>
This commit is contained in:
@@ -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
|
||||||
)
|
)
|
||||||
@@ -127,7 +127,6 @@ object KeyguardBouncerViewBinder {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
view.visibility = View.INVISIBLE
|
|
||||||
securityContainerController.onBouncerVisibilityChanged(
|
securityContainerController.onBouncerVisibilityChanged(
|
||||||
/* isVisible= */ false
|
/* isVisible= */ false
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user