diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java index 144fd3d76ebf..8d86d729d958 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java @@ -22,7 +22,6 @@ import static com.android.systemui.plugins.ActivityStarter.OnDismissAction; import static com.android.systemui.statusbar.phone.BiometricUnlockController.MODE_WAKE_AND_UNLOCK; import static com.android.systemui.statusbar.phone.BiometricUnlockController.MODE_WAKE_AND_UNLOCK_PULSING; import static com.android.systemui.util.kotlin.JavaAdapterKt.collectFlow; -import static com.android.systemui.util.kotlin.JavaAdapterKt.combineFlows; import android.content.Context; import android.content.res.ColorStateList; @@ -472,17 +471,11 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb } if (mFlags.isEnabled(Flags.KEYGUARD_WM_STATE_REFACTOR)) { + // Show the keyguard views whenever we've told WM that the lockscreen is visible. mShadeViewController.postToView(() -> collectFlow( getViewRootImpl().getView(), - combineFlows( - mKeyguardTransitionInteractor.getFinishedKeyguardState(), - mWmLockscreenVisibilityInteractor.get() - .getUsingKeyguardGoingAwayAnimation(), - (finishedState, animating) -> - KeyguardInteractor.Companion.isKeyguardVisibleInState( - finishedState) - || animating), + mWmLockscreenVisibilityInteractor.get().getLockscreenVisibility(), this::consumeShowStatusBarKeyguardView)); } } |