summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Aaron Liu <aaronjli@google.com> 2023-08-04 20:52:45 +0000
committer Aaron Liu <aaronjli@google.com> 2023-08-04 20:55:36 +0000
commit0d2b83ab73efd3b5b997b8efea0c87e84ff471fb (patch)
treea5464d0561dd66ad76ec9fdaf864eff92bcfe39c
parent334ebcea1bd4c211b288878881610c5191cb30b3 (diff)
Revert "Fix user switcher flicker."
This reverts commit 334ebcea1bd4c211b288878881610c5191cb30b3. Reason for revert: User switcher is disappearing after switching users Bug: 290355544 Fixes: 294593868 Change-Id: Id32661934b6d2d381576972cefb614b1e7d647b9
-rw-r--r--packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java2
-rw-r--r--packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBouncerViewBinder.kt2
2 files changed, 0 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
index b2d8113a4028..841b5b3a1e82 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
@@ -1192,8 +1192,6 @@ public class KeyguardSecurityContainer extends ConstraintLayout {
});
mPopup.show();
});
-
- mUserSwitcherViewGroup.setAlpha(0f);
}
@Override
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBouncerViewBinder.kt b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBouncerViewBinder.kt
index bdce7d4fc9d7..c1aefc7bcbd7 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBouncerViewBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBouncerViewBinder.kt
@@ -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(