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

Commit 9dd5ccbc authored by Ivan Makarov's avatar Ivan Makarov Committed by Automerger Merge Worker
Browse files

Merge "Move SplitscreenEventLogger to StageCoordinator" into tm-qpr-dev am: bd8d6fc4 

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



Change-Id: I5089e1b91710abfbc447c3f41ba117d62c0aa917
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1b8ac950 bd8d6fc4

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java

+1 −3
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, 
    private final DragAndDropController mDragAndDropController;

    private final Transitions mTransitions;

    private final TransactionPool mTransactionPool;

    private final SplitscreenEventLogger mLogger;

    private final IconProvider mIconProvider;

    private final Optional<RecentTasksController> mRecentTasksOptional;

    private final SplitScreenShellCommandHandler mSplitScreenShellCommandHandler;
@@ -186,7 +185,6 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, 
        mDragAndDropController = dragAndDropController;

        mTransitions = transitions;

        mTransactionPool = transactionPool;

        mLogger = new SplitscreenEventLogger();

        mIconProvider = iconProvider;

        mRecentTasksOptional = recentTasks;

        mSplitScreenShellCommandHandler = new SplitScreenShellCommandHandler(this);
@@ -221,7 +219,7 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, 
    protected StageCoordinator createStageCoordinator() {

        return new StageCoordinator(mContext, DEFAULT_DISPLAY, mSyncQueue,

                mTaskOrganizer, mDisplayController, mDisplayImeController,

                mDisplayInsetsController, mTransitions, mTransactionPool, mLogger,

                mDisplayInsetsController, mTransitions, mTransactionPool,

                mIconProvider, mMainExecutor, mRecentTasksOptional);

    }

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+4 −4
Original line number Diff line number Diff line
@@ -250,14 +250,14 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
            ShellTaskOrganizer taskOrganizer, DisplayController displayController,

            DisplayImeController displayImeController,

            DisplayInsetsController displayInsetsController, Transitions transitions,

            TransactionPool transactionPool, SplitscreenEventLogger logger,

            TransactionPool transactionPool,

            IconProvider iconProvider, ShellExecutor mainExecutor,

            Optional<RecentTasksController> recentTasks) {

        mContext = context;

        mDisplayId = displayId;

        mSyncQueue = syncQueue;

        mTaskOrganizer = taskOrganizer;

        mLogger = logger;

        mLogger = new SplitscreenEventLogger();

        mMainExecutor = mainExecutor;

        mRecentTasks = recentTasks;
@@ -301,7 +301,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
            DisplayController displayController, DisplayImeController displayImeController,

            DisplayInsetsController displayInsetsController, SplitLayout splitLayout,

            Transitions transitions, TransactionPool transactionPool,

            SplitscreenEventLogger logger, ShellExecutor mainExecutor,

            ShellExecutor mainExecutor,

            Optional<RecentTasksController> recentTasks) {

        mContext = context;

        mDisplayId = displayId;
@@ -316,7 +316,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        mSplitLayout = splitLayout;

        mSplitTransitions = new SplitScreenTransitions(transactionPool, transitions,

                this::onTransitionAnimationComplete, this);

        mLogger = logger;

        mLogger = new SplitscreenEventLogger();

        mMainExecutor = mainExecutor;

        mRecentTasks = recentTasks;

        mDisplayController.addDisplayWindowListener(this);

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitTestUtils.java

+2 −2
Original line number Diff line number Diff line
@@ -71,11 +71,11 @@ public class SplitTestUtils { 
                DisplayController displayController, DisplayImeController imeController,

                DisplayInsetsController insetsController, SplitLayout splitLayout,

                Transitions transitions, TransactionPool transactionPool,

                SplitscreenEventLogger logger, ShellExecutor mainExecutor,

                ShellExecutor mainExecutor,

                Optional<RecentTasksController> recentTasks) {

            super(context, displayId, syncQueue, taskOrganizer, mainStage,

                    sideStage, displayController, imeController, insetsController, splitLayout,

                    transitions, transactionPool, logger, mainExecutor, recentTasks);

                    transitions, transactionPool, mainExecutor, recentTasks);



            // Prepare root task for testing.

            mRootTask = new TestRunningTaskInfoBuilder().build();

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitTransitionTests.java

+1 −2
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ public class SplitTransitionTests extends ShellTestCase { 
    @Mock private TransactionPool mTransactionPool;

    @Mock private Transitions mTransitions;

    @Mock private SurfaceSession mSurfaceSession;

    @Mock private SplitscreenEventLogger mLogger;

    @Mock private IconProvider mIconProvider;

    @Mock private ShellExecutor mMainExecutor;

    private SplitLayout mSplitLayout;
@@ -127,7 +126,7 @@ public class SplitTransitionTests extends ShellTestCase { 
        mStageCoordinator = new SplitTestUtils.TestStageCoordinator(mContext, DEFAULT_DISPLAY,

                mSyncQueue, mTaskOrganizer, mMainStage, mSideStage, mDisplayController,

                mDisplayImeController, mDisplayInsetsController, mSplitLayout, mTransitions,

                mTransactionPool, mLogger, mMainExecutor, Optional.empty());

                mTransactionPool, mMainExecutor, Optional.empty());

        mSplitScreenTransitions = mStageCoordinator.getSplitTransitions();

        doAnswer((Answer<IBinder>) invocation -> mock(IBinder.class))

                .when(mTransitions).startTransition(anyInt(), any(), any());

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageCoordinatorTests.java

+1 −3
Original line number Diff line number Diff line
@@ -97,8 +97,6 @@ public class StageCoordinatorTests extends ShellTestCase { 
    @Mock

    private TransactionPool mTransactionPool;

    @Mock

    private SplitscreenEventLogger mLogger;

    @Mock

    private ShellExecutor mMainExecutor;



    private final Rect mBounds1 = new Rect(10, 20, 30, 40);
@@ -115,7 +113,7 @@ public class StageCoordinatorTests extends ShellTestCase { 
        MockitoAnnotations.initMocks(this);

        mStageCoordinator = spy(new StageCoordinator(mContext, DEFAULT_DISPLAY, mSyncQueue,

                mTaskOrganizer, mMainStage, mSideStage, mDisplayController, mDisplayImeController,

                mDisplayInsetsController, mSplitLayout, mTransitions, mTransactionPool, mLogger,

                mDisplayInsetsController, mSplitLayout, mTransitions, mTransactionPool,

                mMainExecutor, Optional.empty()));

        doNothing().when(mStageCoordinator).updateActivityOptions(any(), anyInt());