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

Commit 1da9e340 authored by Nicolò Mazzucato's avatar Nicolò Mazzucato Committed by Automerger Merge Worker
Browse files

Merge "Only reinflate bouncer after rotation if flag enabled" into udc-qpr-dev... 

Merge "Only reinflate bouncer after rotation if flag enabled" into udc-qpr-dev am: 4b5d78bb am: 7b475a41

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



Change-Id: I1117eba4703637f662e4680213cc63f01e6c7d9f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1f4c6d0d 7b475a41

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

+6 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import static com.android.keyguard.KeyguardSecurityContainer.USER_TYPE_PRIMARY; 
import static com.android.keyguard.KeyguardSecurityContainer.USER_TYPE_SECONDARY_USER;

import static com.android.keyguard.KeyguardSecurityContainer.USER_TYPE_WORK_PROFILE;

import static com.android.systemui.DejankUtils.whitelistIpcs;

import static com.android.systemui.flags.Flags.LOCKSCREEN_ENABLE_LANDSCAPE;

import static com.android.systemui.flags.Flags.REVAMPED_BOUNCER_MESSAGES;



import android.app.ActivityManager;
@@ -370,9 +371,13 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 


                @Override

                public void onOrientationChanged(int orientation) {

                    if (mFeatureFlags.isEnabled(LOCKSCREEN_ENABLE_LANDSCAPE)) {

                        // TODO(b/295603468)

                        // Fix reinflation of views when flag is enabled.

                        KeyguardSecurityContainerController.this

                            .onDensityOrFontScaleOrOrientationChanged();

                    }

                }

            };

    private final KeyguardUpdateMonitorCallback mKeyguardUpdateMonitorCallback =

            new KeyguardUpdateMonitorCallback() {

packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.kt

+45 −0
Original line number Diff line number Diff line
@@ -621,6 +621,51 @@ class KeyguardSecurityContainerControllerTest : SysuiTestCase() { 
        configurationListenerArgumentCaptor.value.onUiModeChanged()

        verify(view).reloadColors()

    }

    @Test

    fun onOrientationChanged_landscapeKeyguardFlagDisabled_blockReinflate() {

        featureFlags.set(Flags.LOCKSCREEN_ENABLE_LANDSCAPE, false)



        // Run onOrientationChanged

        val configurationListenerArgumentCaptor =

            ArgumentCaptor.forClass(ConfigurationController.ConfigurationListener::class.java)

        underTest.onViewAttached()

        verify(configurationController).addCallback(configurationListenerArgumentCaptor.capture())

        clearInvocations(viewFlipperController)

        configurationListenerArgumentCaptor.value.onOrientationChanged(

            Configuration.ORIENTATION_LANDSCAPE

        )

        // Verify view is reinflated when flag is on

        verify(viewFlipperController, never()).clearViews()

        verify(viewFlipperController, never())

            .asynchronouslyInflateView(

                eq(SecurityMode.PIN),

                any(),

                onViewInflatedCallbackArgumentCaptor.capture()

            )

    }



    @Test

    fun onOrientationChanged_landscapeKeyguardFlagEnabled_doesReinflate() {

        featureFlags.set(Flags.LOCKSCREEN_ENABLE_LANDSCAPE, true)



        // Run onOrientationChanged

        val configurationListenerArgumentCaptor =

            ArgumentCaptor.forClass(ConfigurationController.ConfigurationListener::class.java)

        underTest.onViewAttached()

        verify(configurationController).addCallback(configurationListenerArgumentCaptor.capture())

        clearInvocations(viewFlipperController)

        configurationListenerArgumentCaptor.value.onOrientationChanged(

            Configuration.ORIENTATION_LANDSCAPE

        )

        // Verify view is reinflated when flag is on

        verify(viewFlipperController).clearViews()

        verify(viewFlipperController)

            .asynchronouslyInflateView(

                eq(SecurityMode.PIN),

                any(),

                onViewInflatedCallbackArgumentCaptor.capture()

            )

    }



    @Test

    fun hasDismissActions() {