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

Commit 9f638820 authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge "Revert "Fix user switcher flicker."" into udc-dev am: adf330a1 

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



Change-Id: I16da63642e1bbd34397d18ec04bdfe968d1b933a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4db310c6 adf330a1

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

+0 −2
Original line number Diff line number Diff line
@@ -1191,8 +1191,6 @@ public class KeyguardSecurityContainer extends ConstraintLayout { 
                });

                mPopup.show();

            });



            mUserSwitcherViewGroup.setAlpha(0f);

        }



        @Override

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

+0 −2
Original line number Diff line number Diff line
@@ -112,8 +112,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(