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

Commit 53d29b37 authored by Jorge Gil's avatar Jorge Gil Committed by Android (Google) Code Review
Browse files

Merge changes Ic37afd36,I37127a0f into main 

* changes:
  Convert DesktopModeWindowDecorViewModelTests to kt
  Use TestableLooper.RunWithLooper in unit tests
parents f13f49c5 6ffe36f5

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java

+2 −4
Original line number Original line Diff line number Diff line
@@ -125,7 +125,8 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 




    private MoveToDesktopAnimator mMoveToDesktopAnimator;

    private MoveToDesktopAnimator mMoveToDesktopAnimator;

    private final Rect mDragToDesktopAnimationStartBounds = new Rect();

    private final Rect mDragToDesktopAnimationStartBounds = new Rect();

    private final DesktopModeKeyguardChangeListener mDesktopModeKeyguardChangeListener;

    private final DesktopModeKeyguardChangeListener mDesktopModeKeyguardChangeListener =

            new DesktopModeKeyguardChangeListener();

    private final RootTaskDisplayAreaOrganizer mRootTaskDisplayAreaOrganizer;

    private final RootTaskDisplayAreaOrganizer mRootTaskDisplayAreaOrganizer;





    public DesktopModeWindowDecorViewModel(

    public DesktopModeWindowDecorViewModel(
@@ -157,7 +158,6 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
                new DesktopModeWindowDecoration.Factory(),

                new DesktopModeWindowDecoration.Factory(),

                new InputMonitorFactory(),

                new InputMonitorFactory(),

                SurfaceControl.Transaction::new,

                SurfaceControl.Transaction::new,

                new DesktopModeKeyguardChangeListener(),

                rootTaskDisplayAreaOrganizer);

                rootTaskDisplayAreaOrganizer);

    }

    }
@@ -177,7 +177,6 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
            DesktopModeWindowDecoration.Factory desktopModeWindowDecorFactory,

            DesktopModeWindowDecoration.Factory desktopModeWindowDecorFactory,

            InputMonitorFactory inputMonitorFactory,

            InputMonitorFactory inputMonitorFactory,

            Supplier<SurfaceControl.Transaction> transactionFactory,

            Supplier<SurfaceControl.Transaction> transactionFactory,

            DesktopModeKeyguardChangeListener desktopModeKeyguardChangeListener,

            RootTaskDisplayAreaOrganizer rootTaskDisplayAreaOrganizer) {

            RootTaskDisplayAreaOrganizer rootTaskDisplayAreaOrganizer) {

        mContext = context;

        mContext = context;

        mMainHandler = mainHandler;

        mMainHandler = mainHandler;
@@ -194,7 +193,6 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
        mDesktopModeWindowDecorFactory = desktopModeWindowDecorFactory;

        mDesktopModeWindowDecorFactory = desktopModeWindowDecorFactory;

        mInputMonitorFactory = inputMonitorFactory;

        mInputMonitorFactory = inputMonitorFactory;

        mTransactionFactory = transactionFactory;

        mTransactionFactory = transactionFactory;

        mDesktopModeKeyguardChangeListener = desktopModeKeyguardChangeListener;

        mRootTaskDisplayAreaOrganizer = rootTaskDisplayAreaOrganizer;

        mRootTaskDisplayAreaOrganizer = rootTaskDisplayAreaOrganizer;





        shellInit.addInitCallback(this::onInit, this);

        shellInit.addInitCallback(this::onInit, this);

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModelTests.java

deleted100644 → 0
+0 −362
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.wm.shell.windowdecor;



import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;

import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;

import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;



import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.any;

import static org.mockito.Mockito.doNothing;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.app.ActivityManager;

import android.app.WindowConfiguration;

import android.graphics.Rect;

import android.hardware.display.DisplayManager;

import android.hardware.display.VirtualDisplay;

import android.hardware.input.InputManager;

import android.os.Handler;

import android.os.IBinder;

import android.os.Looper;

import android.view.Choreographer;

import android.view.Display;

import android.view.InputChannel;

import android.view.InputMonitor;

import android.view.SurfaceControl;

import android.view.SurfaceView;



import androidx.test.filters.SmallTest;



import com.android.wm.shell.RootTaskDisplayAreaOrganizer;

import com.android.wm.shell.ShellTaskOrganizer;

import com.android.wm.shell.ShellTestCase;

import com.android.wm.shell.TestRunningTaskInfoBuilder;

import com.android.wm.shell.common.DisplayController;

import com.android.wm.shell.common.DisplayLayout;

import com.android.wm.shell.common.ShellExecutor;

import com.android.wm.shell.common.SyncTransactionQueue;

import com.android.wm.shell.desktopmode.DesktopTasksController;

import com.android.wm.shell.recents.RecentsTransitionHandler;

import com.android.wm.shell.recents.RecentsTransitionStateListener;

import com.android.wm.shell.sysui.ShellController;

import com.android.wm.shell.sysui.ShellInit;

import com.android.wm.shell.transition.Transitions;



import org.junit.Before;

import org.junit.Test;

import org.mockito.ArgumentCaptor;

import org.mockito.Mock;



import java.util.ArrayList;

import java.util.List;

import java.util.Optional;

import java.util.concurrent.CountDownLatch;

import java.util.concurrent.TimeUnit;

import java.util.function.Supplier;



/** Tests of {@link DesktopModeWindowDecorViewModel} */

@SmallTest

public class DesktopModeWindowDecorViewModelTests extends ShellTestCase {



    private static final String TAG = "DesktopModeWindowDecorViewModelTests";

    private static  final Rect STABLE_INSETS = new Rect(0, 100, 0, 0);



    @Mock private DesktopModeWindowDecoration mDesktopModeWindowDecoration;

    @Mock private DesktopModeWindowDecoration.Factory mDesktopModeWindowDecorFactory;



    @Mock private Handler mMainHandler;

    @Mock private Choreographer mMainChoreographer;

    @Mock private ShellTaskOrganizer mTaskOrganizer;

    @Mock private DisplayController mDisplayController;

    @Mock private DisplayLayout mDisplayLayout;

    @Mock private SyncTransactionQueue mSyncQueue;

    @Mock private DesktopTasksController mDesktopTasksController;

    @Mock private InputMonitor mInputMonitor;

    @Mock private InputManager mInputManager;

    @Mock private Transitions mTransitions;

    @Mock private DesktopModeWindowDecorViewModel.InputMonitorFactory mMockInputMonitorFactory;

    @Mock private Supplier<SurfaceControl.Transaction> mTransactionFactory;

    @Mock private SurfaceControl.Transaction mTransaction;

    @Mock private Display mDisplay;

    @Mock private ShellController mShellController;

    @Mock private ShellExecutor mShellExecutor;

    @Mock private DesktopModeWindowDecorViewModel.DesktopModeKeyguardChangeListener

            mDesktopModeKeyguardChangeListener;

    @Mock private RootTaskDisplayAreaOrganizer mRootTaskDisplayAreaOrganizer;

    @Mock private RecentsTransitionHandler mRecentsTransitionHandler;



    private final List<InputManager> mMockInputManagers = new ArrayList<>();



    private ShellInit mShellInit;

    private DesktopModeWindowDecorViewModel mDesktopModeWindowDecorViewModel;



    @Before

    public void setUp() {

        mMockInputManagers.add(mInputManager);

        mShellInit = new ShellInit(mShellExecutor);

        mDesktopModeWindowDecorViewModel =

                new DesktopModeWindowDecorViewModel(

                        mContext,

                        mMainHandler,

                        mMainChoreographer,

                        mShellInit,

                        mTaskOrganizer,

                        mDisplayController,

                        mShellController,

                        mSyncQueue,

                        mTransitions,

                        Optional.of(mDesktopTasksController),

                        mRecentsTransitionHandler,

                        mDesktopModeWindowDecorFactory,

                        mMockInputMonitorFactory,

                        mTransactionFactory,

                        mDesktopModeKeyguardChangeListener,

                        mRootTaskDisplayAreaOrganizer

                );



        doReturn(mDesktopModeWindowDecoration)

                .when(mDesktopModeWindowDecorFactory)

                .create(any(), any(), any(), any(), any(), any(), any(), any(), any());

        doReturn(mTransaction).when(mTransactionFactory).get();

        doReturn(mDisplayLayout).when(mDisplayController).getDisplayLayout(anyInt());

        doReturn(STABLE_INSETS).when(mDisplayLayout).stableInsets();

        doNothing().when(mShellController).addKeyguardChangeListener(any());



        when(mMockInputMonitorFactory.create(any(), any())).thenReturn(mInputMonitor);

        // InputChannel cannot be mocked because it passes to InputEventReceiver.

        final InputChannel[] inputChannels = InputChannel.openInputChannelPair(TAG);

        inputChannels[0].dispose();

        when(mInputMonitor.getInputChannel()).thenReturn(inputChannels[1]);



        mDesktopModeWindowDecoration.mDisplay = mDisplay;

        doReturn(Display.DEFAULT_DISPLAY).when(mDisplay).getDisplayId();



        mShellInit.init();

    }



    @Test

    public void testDeleteCaptionOnChangeTransitionWhenNecessary() throws Exception {

        final int taskId = 1;

        final ActivityManager.RunningTaskInfo taskInfo =

                createTaskInfo(taskId, Display.DEFAULT_DISPLAY, WINDOWING_MODE_FREEFORM);

        SurfaceControl surfaceControl = mock(SurfaceControl.class);

        runOnMainThread(() -> {

            final SurfaceControl.Transaction startT = mock(SurfaceControl.Transaction.class);

            final SurfaceControl.Transaction finishT = mock(SurfaceControl.Transaction.class);



            mDesktopModeWindowDecorViewModel.onTaskOpening(

                    taskInfo, surfaceControl, startT, finishT);



            taskInfo.configuration.windowConfiguration.setWindowingMode(WINDOWING_MODE_UNDEFINED);

            taskInfo.configuration.windowConfiguration.setActivityType(ACTIVITY_TYPE_UNDEFINED);

            mDesktopModeWindowDecorViewModel.onTaskChanging(

                    taskInfo, surfaceControl, startT, finishT);

        });

        verify(mDesktopModeWindowDecorFactory)

                .create(

                        mContext,

                        mDisplayController,

                        mTaskOrganizer,

                        taskInfo,

                        surfaceControl,

                        mMainHandler,

                        mMainChoreographer,

                        mSyncQueue,

                        mRootTaskDisplayAreaOrganizer);

        verify(mDesktopModeWindowDecoration).close();

    }



    @Test

    public void testCreateCaptionOnChangeTransitionWhenNecessary() throws Exception {

        final int taskId = 1;

        final ActivityManager.RunningTaskInfo taskInfo =

                createTaskInfo(taskId, Display.DEFAULT_DISPLAY, WINDOWING_MODE_UNDEFINED);

        SurfaceControl surfaceControl = mock(SurfaceControl.class);

        runOnMainThread(() -> {

            final SurfaceControl.Transaction startT = mock(SurfaceControl.Transaction.class);

            final SurfaceControl.Transaction finishT = mock(SurfaceControl.Transaction.class);

            taskInfo.configuration.windowConfiguration.setActivityType(ACTIVITY_TYPE_UNDEFINED);



            mDesktopModeWindowDecorViewModel.onTaskChanging(

                    taskInfo, surfaceControl, startT, finishT);



            taskInfo.configuration.windowConfiguration.setWindowingMode(WINDOWING_MODE_FREEFORM);

            taskInfo.configuration.windowConfiguration.setActivityType(ACTIVITY_TYPE_STANDARD);



            mDesktopModeWindowDecorViewModel.onTaskChanging(

                    taskInfo, surfaceControl, startT, finishT);

        });

        verify(mDesktopModeWindowDecorFactory, times(1))

                .create(

                        mContext,

                        mDisplayController,

                        mTaskOrganizer,

                        taskInfo,

                        surfaceControl,

                        mMainHandler,

                        mMainChoreographer,

                        mSyncQueue,

                        mRootTaskDisplayAreaOrganizer);

    }



    @Test

    public void testCreateAndDisposeEventReceiver() throws Exception {

        final int taskId = 1;

        final ActivityManager.RunningTaskInfo taskInfo =

                createTaskInfo(taskId, Display.DEFAULT_DISPLAY, WINDOWING_MODE_FREEFORM);

        taskInfo.configuration.windowConfiguration.setActivityType(ACTIVITY_TYPE_STANDARD);

        runOnMainThread(() -> {

            SurfaceControl surfaceControl = mock(SurfaceControl.class);

            final SurfaceControl.Transaction startT = mock(SurfaceControl.Transaction.class);

            final SurfaceControl.Transaction finishT = mock(SurfaceControl.Transaction.class);



            mDesktopModeWindowDecorViewModel.onTaskOpening(

                    taskInfo, surfaceControl, startT, finishT);



            mDesktopModeWindowDecorViewModel.destroyWindowDecoration(taskInfo);

        });

        verify(mMockInputMonitorFactory).create(any(), any());

        verify(mInputMonitor).dispose();

    }



    @Test

    public void testEventReceiversOnMultipleDisplays() throws Exception {

        runOnMainThread(() -> {

            SurfaceView surfaceView = new SurfaceView(mContext);

            final DisplayManager mDm = mContext.getSystemService(DisplayManager.class);

            final VirtualDisplay secondaryDisplay = mDm.createVirtualDisplay(

                    "testEventReceiversOnMultipleDisplays", /*width=*/ 400, /*height=*/ 400,

                    /*densityDpi=*/ 320, surfaceView.getHolder().getSurface(),

                    DisplayManager.VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY);

            try {

                int secondaryDisplayId = secondaryDisplay.getDisplay().getDisplayId();



                final int taskId = 1;

                final ActivityManager.RunningTaskInfo taskInfo =

                        createTaskInfo(taskId, Display.DEFAULT_DISPLAY, WINDOWING_MODE_FREEFORM);

                final ActivityManager.RunningTaskInfo secondTaskInfo =

                        createTaskInfo(taskId + 1, secondaryDisplayId, WINDOWING_MODE_FREEFORM);

                final ActivityManager.RunningTaskInfo thirdTaskInfo =

                        createTaskInfo(taskId + 2, secondaryDisplayId, WINDOWING_MODE_FREEFORM);



                SurfaceControl surfaceControl = mock(SurfaceControl.class);

                final SurfaceControl.Transaction startT = mock(SurfaceControl.Transaction.class);

                final SurfaceControl.Transaction finishT = mock(SurfaceControl.Transaction.class);



                mDesktopModeWindowDecorViewModel.onTaskOpening(taskInfo, surfaceControl, startT,

                        finishT);

                mDesktopModeWindowDecorViewModel.onTaskOpening(secondTaskInfo, surfaceControl,

                        startT, finishT);

                mDesktopModeWindowDecorViewModel.onTaskOpening(thirdTaskInfo, surfaceControl,

                        startT, finishT);

                mDesktopModeWindowDecorViewModel.destroyWindowDecoration(thirdTaskInfo);

                mDesktopModeWindowDecorViewModel.destroyWindowDecoration(taskInfo);

            } finally {

                secondaryDisplay.release();

            }

        });

        verify(mMockInputMonitorFactory, times(2)).create(any(), any());

        verify(mInputMonitor, times(1)).dispose();

    }



    @Test

    public void testCaptionIsNotCreatedWhenKeyguardIsVisible() throws Exception {

        doReturn(true).when(

                mDesktopModeKeyguardChangeListener).isKeyguardVisibleAndOccluded();



        final int taskId = 1;

        final ActivityManager.RunningTaskInfo taskInfo =

                createTaskInfo(taskId, Display.DEFAULT_DISPLAY, WINDOWING_MODE_FULLSCREEN);

        taskInfo.isFocused = true;

        SurfaceControl surfaceControl = mock(SurfaceControl.class);

        runOnMainThread(() -> {

            final SurfaceControl.Transaction startT = mock(SurfaceControl.Transaction.class);

            final SurfaceControl.Transaction finishT = mock(SurfaceControl.Transaction.class);



            mDesktopModeWindowDecorViewModel.onTaskOpening(

                    taskInfo, surfaceControl, startT, finishT);



            taskInfo.configuration.windowConfiguration.setWindowingMode(WINDOWING_MODE_UNDEFINED);

            taskInfo.configuration.windowConfiguration.setActivityType(ACTIVITY_TYPE_UNDEFINED);

            mDesktopModeWindowDecorViewModel.onTaskChanging(

                    taskInfo, surfaceControl, startT, finishT);

        });

        verify(mDesktopModeWindowDecorFactory, never())

                .create(any(), any(), any(), any(), any(), any(), any(), any(), any());

    }



    @Test

    public void testRelayoutBlockedDuringRecentsTransition() throws Exception {

        final ArgumentCaptor<RecentsTransitionStateListener> recentsCaptor =

                ArgumentCaptor.forClass(RecentsTransitionStateListener.class);

        verify(mRecentsTransitionHandler).addTransitionStateListener(recentsCaptor.capture());



        final IBinder transition = mock(IBinder.class);

        final DesktopModeWindowDecoration decoration = mock(DesktopModeWindowDecoration.class);

        final SurfaceControl.Transaction startT = mock(SurfaceControl.Transaction.class);

        final SurfaceControl.Transaction finishT = mock(SurfaceControl.Transaction.class);

        final int taskId = 1;

        final SurfaceControl taskSurface = new SurfaceControl();

        final ActivityManager.RunningTaskInfo taskInfo =

                createTaskInfo(taskId, Display.DEFAULT_DISPLAY, WINDOWING_MODE_FREEFORM);

        doReturn(decoration).when(mDesktopModeWindowDecorFactory)

                .create(any(), any(), any(), eq(taskInfo), eq(taskSurface), any(), any(), any(),

                        any());



        runOnMainThread(() -> {

            // Make sure a window decorations exists first by launching a freeform task.

            mDesktopModeWindowDecorViewModel.onTaskOpening(

                    taskInfo, taskSurface, startT, finishT);

            // Now call back when as a Recents transition starts.

            recentsCaptor.getValue().onTransitionStarted(transition);

        });



        verify(decoration).incrementRelayoutBlock();

        verify(decoration).addTransitionPausingRelayout(transition);

    }



    private void runOnMainThread(Runnable r) throws Exception {

        final Handler mainHandler = new Handler(Looper.getMainLooper());

        final CountDownLatch latch = new CountDownLatch(1);

        mainHandler.post(() -> {

            r.run();

            latch.countDown();

        });

        latch.await(1, TimeUnit.SECONDS);

    }



    private static ActivityManager.RunningTaskInfo createTaskInfo(int taskId,

            int displayId, @WindowConfiguration.WindowingMode int windowingMode) {

        ActivityManager.RunningTaskInfo taskInfo =

                new TestRunningTaskInfoBuilder()

                        .setDisplayId(displayId)

                        .setVisible(true)

                        .build();

        taskInfo.taskId = taskId;

        taskInfo.configuration.windowConfiguration.setWindowingMode(windowingMode);

        return taskInfo;

    }

}

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModelTests.kt

0 → 100644
+344 −0

File added.

Preview size limit exceeded, changes collapsed.