diff options
| author | 2023-07-31 19:10:24 +0000 | |
|---|---|---|
| committer | 2023-07-31 19:10:24 +0000 | |
| commit | 87edae242aaf6c91c63da33c9ef7191bc8ff6e10 (patch) | |
| tree | ecc523a5b809b3dc6c0a7c1ed594637961531c80 | |
| parent | f571f62a647baab1cde7a4dea56050e4f4883b9a (diff) | |
| parent | 5ac2acc26902cf47363f593e5d7cd039d2cdb3b8 (diff) | |
Merge "Fix user switcher flicker." into udc-qpr-dev am: 3cb96b87d3 am: 5ac2acc269
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24153952
Change-Id: I53e9b39311a9003e21f234ac94bb754436acc0cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/bouncer/ui/binder/KeyguardBouncerViewBinder.kt | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java index 61addabe7341..8a0c9ef6680c 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java @@ -1198,6 +1198,8 @@ 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 34e934bec003..d9ec5d0d1744 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,6 +120,8 @@ 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( |