diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java index 3b09910fbe88a..9d69fbab8b4d4 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java @@ -676,6 +676,14 @@ public class KeyguardSecurityContainerController extends ViewController view.visibility = if (isShowing) View.VISIBLE else View.INVISIBLE if (isShowing) { + // Reset security container because these views are not reinflated. + securityContainerController.prepareToShow() securityContainerController.reinflateViewFlipper { // Reset Security Container entirely. securityContainerController.onBouncerVisibilityChanged( diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.kt b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.kt index e447c29b351f4..7ed32865d208d 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.kt @@ -27,6 +27,7 @@ import android.testing.TestableResources import android.view.Gravity import android.view.LayoutInflater import android.view.MotionEvent +import android.view.View import android.view.WindowInsetsController import android.widget.FrameLayout import androidx.test.filters.SmallTest @@ -80,6 +81,7 @@ import org.mockito.Captor import org.mockito.Mock import org.mockito.Mockito.atLeastOnce import org.mockito.Mockito.clearInvocations +import org.mockito.Mockito.mock import org.mockito.Mockito.never import org.mockito.Mockito.spy import org.mockito.Mockito.verify @@ -772,6 +774,16 @@ class KeyguardSecurityContainerControllerTest : SysuiTestCase() { verify(viewMediatorCallback).keyguardDone(anyBoolean(), anyInt()) } + @Test + fun testResetUserSwitcher() { + val userSwitcher = mock(View::class.java) + whenever(view.findViewById(R.id.keyguard_bouncer_user_switcher)) + .thenReturn(userSwitcher) + + underTest.prepareToShow() + verify(userSwitcher).setAlpha(0f) + } + private val registeredSwipeListener: KeyguardSecurityContainer.SwipeListener get() { underTest.onViewAttached()