From e8610d7369e4788831991fd2e5e50c164914accd Mon Sep 17 00:00:00 2001
From: Aaron Liu <aaronjli@google.com>
Date: Mon, 7 Aug 2023 09:04:07 -0700
Subject: [PATCH] Revert "Fix user switcher flicker."

This reverts commit dc072507d0f52deb7e23ca5618816dbf18952204.

Fixes: 294593868
Test: switcher users in user bouncer.
Change-Id: Ie2b830d09a45e5dd95015749bd4631ff00994993
---
 .../src/com/android/keyguard/KeyguardSecurityContainer.java     | 2 --
 .../systemui/bouncer/ui/binder/KeyguardBouncerViewBinder.kt     | 2 --
 2 files changed, 4 deletions(-)

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
index dc1ddc77dd6ca..42a4e7202c824 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
@@ -1197,8 +1197,6 @@ public class KeyguardSecurityContainer extends ConstraintLayout {
                 });
                 mPopup.show();
             });
-
-            mUserSwitcherViewGroup.setAlpha(0f);
         }
 
         @Override
diff --git a/packages/SystemUI/src/com/android/systemui/bouncer/ui/binder/KeyguardBouncerViewBinder.kt b/packages/SystemUI/src/com/android/systemui/bouncer/ui/binder/KeyguardBouncerViewBinder.kt
index d9ec5d0d17442..34e934bec0032 100644
--- a/packages/SystemUI/src/com/android/systemui/bouncer/ui/binder/KeyguardBouncerViewBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/bouncer/ui/binder/KeyguardBouncerViewBinder.kt
@@ -120,8 +120,6 @@ object KeyguardBouncerViewBinder {
                         viewModel.isShowing.collect { isShowing ->
                             view.visibility = if (isShowing) View.VISIBLE else View.INVISIBLE
                             if (isShowing) {
-                                // Reset security container because these views are not reinflated.
-                                securityContainerController.reset()
                                 securityContainerController.reinflateViewFlipper {
                                     // Reset Security Container entirely.
                                     securityContainerController.onBouncerVisibilityChanged(