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

Commit 09a06ecc authored by Beverly's avatar Beverly
Browse files

[flexiglass] on showPrimaryBouncer, change to bouncer scene 

Calls to showPrimaryBouncer occur when SysUI specifically
wants to show the primary bouncer and NOT the alternate bouncer.
An example of this is when there's a tap or swipe gesture
on the alternate bouncer, the primary bouncer should show.

Bug: 353955910
Flag: com.android.systemui.scene_container
Test: atest StatusBarKeyguardViewManagerTest
Change-Id: I36700ed58f5ce83837f5ae98ad5d8583d6159acc
parent 81f492c2

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

+4 −1
Original line number Diff line number Diff line
@@ -802,7 +802,10 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
        hideAlternateBouncer(false);

        if (mKeyguardStateController.isShowing() && !isBouncerShowing()) {

            if (SceneContainerFlag.isEnabled()) {

                mDeviceEntryInteractorLazy.get().attemptDeviceEntry();

                mSceneInteractorLazy.get().changeScene(

                        Scenes.Bouncer,

                        "primary bouncer requested"

                );

            } else {

                mPrimaryBouncerInteractor.show(scrimmed);

            }

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java

+11 −6
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import static org.mockito.ArgumentMatchers.any; 
import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.ArgumentMatchers.anyFloat;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.clearInvocations;

import static org.mockito.Mockito.mock;
@@ -94,6 +95,7 @@ import com.android.systemui.navigationbar.TaskbarDelegate; 
import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.plugins.ActivityStarter.OnDismissAction;

import com.android.systemui.scene.domain.interactor.SceneInteractor;

import com.android.systemui.scene.shared.model.Scenes;

import com.android.systemui.shade.NotificationShadeWindowView;

import com.android.systemui.shade.ShadeController;

import com.android.systemui.shade.ShadeExpansionChangeEvent;
@@ -166,6 +168,7 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { 
    @Mock private StatusBarKeyguardViewManager.KeyguardViewManagerCallback mCallback;

    @Mock private SelectedUserInteractor mSelectedUserInteractor;

    @Mock private DeviceEntryInteractor mDeviceEntryInteractor;

    @Mock private SceneInteractor mSceneInteractor;



    private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;

    private PrimaryBouncerCallbackInteractor.PrimaryBouncerExpansionCallback
@@ -233,7 +236,7 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { 
                        mSelectedUserInteractor,

                        () -> mock(KeyguardSurfaceBehindInteractor.class),

                        mock(JavaAdapter.class),

                        () -> mock(SceneInteractor.class),

                        () -> mSceneInteractor,

                        mock(StatusBarKeyguardViewManagerInteractor.class),

                        () -> mDeviceEntryInteractor) {

                    @Override
@@ -270,21 +273,23 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { 
    }



    @Test

    public void showBouncer_onlyWhenShowing() {

    public void showPrimaryBouncer_onlyWhenShowing() {

        mStatusBarKeyguardViewManager.hide(0 /* startTime */, 0 /* fadeoutDuration */);

        mStatusBarKeyguardViewManager.showPrimaryBouncer(true /* scrimmed */);

        verify(mPrimaryBouncerInteractor, never()).show(anyBoolean());

        verify(mDeviceEntryInteractor, never()).attemptDeviceEntry();

        verify(mSceneInteractor, never()).changeScene(any(), any());

    }



    @Test

    public void showBouncer_notWhenBouncerAlreadyShowing() {

    public void showPrimaryBouncer_notWhenBouncerAlreadyShowing() {

        mStatusBarKeyguardViewManager.hide(0 /* startTime */, 0 /* fadeoutDuration */);

        when(mKeyguardSecurityModel.getSecurityMode(anyInt())).thenReturn(

                KeyguardSecurityModel.SecurityMode.Password);

        mStatusBarKeyguardViewManager.showPrimaryBouncer(true /* scrimmed */);

        verify(mPrimaryBouncerInteractor, never()).show(anyBoolean());

        verify(mDeviceEntryInteractor, never()).attemptDeviceEntry();

        verify(mSceneInteractor, never()).changeScene(any(), any());

    }



    @Test
@@ -753,7 +758,7 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { 
                        mSelectedUserInteractor,

                        () -> mock(KeyguardSurfaceBehindInteractor.class),

                        mock(JavaAdapter.class),

                        () -> mock(SceneInteractor.class),

                        () -> mSceneInteractor,

                        mock(StatusBarKeyguardViewManagerInteractor.class),

                        () -> mDeviceEntryInteractor) {

                    @Override
@@ -1104,9 +1109,9 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { 


    @Test

    @EnableSceneContainer

    public void showPrimaryBouncer_attemptDeviceEntry() {

    public void showPrimaryBouncer() {

        mStatusBarKeyguardViewManager.showPrimaryBouncer(false);

        verify(mDeviceEntryInteractor).attemptDeviceEntry();

        verify(mSceneInteractor).changeScene(eq(Scenes.Bouncer), anyString());

    }



    @Test