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

Commit 3cb96b87 authored Jul 31, 2023 by Aaron Liu Committed by Android (Google) Code Review Jul 31, 2023

Merge "Fix user switcher flicker." into udc-qpr-dev

parents 5b0bec26 dc072507

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1197,6 +1197,8 @@ public class KeyguardSecurityContainer extends ConstraintLayout {
	});		});
	mPopup.show();		mPopup.show();
	});		});

			mUserSwitcherViewGroup.setAlpha(0f);
	}		}

	@Override		@Override

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -120,6 +120,8 @@ object KeyguardBouncerViewBinder {
	viewModel.isShowing.collect { isShowing ->		viewModel.isShowing.collect { isShowing ->
	view.visibility = if (isShowing) View.VISIBLE else View.INVISIBLE		view.visibility = if (isShowing) View.VISIBLE else View.INVISIBLE
	if (isShowing) {		if (isShowing) {
			// Reset security container because these views are not reinflated.
			securityContainerController.reset()
	securityContainerController.reinflateViewFlipper {		securityContainerController.reinflateViewFlipper {
	// Reset Security Container entirely.		// Reset Security Container entirely.
	securityContainerController.onBouncerVisibilityChanged(		securityContainerController.onBouncerVisibilityChanged(