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

Commit 29f7983f authored by Ivan Makarov's avatar Ivan Makarov Committed by Android (Google) Code Review
Browse files

Merge "Move SplitscreenEventLogger to StageCoordinator"

parents d494c714 c6dd3956

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/src/com/android/wm/shell/splitscreen/tv/TvSplitScreenController.java

+1 −2
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import com.android.wm.shell.common.TransactionPool; 
import com.android.wm.shell.draganddrop.DragAndDropController;

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

import com.android.wm.shell.splitscreen.SplitScreenController;

import com.android.wm.shell.splitscreen.SplitscreenEventLogger;

import com.android.wm.shell.splitscreen.StageCoordinator;

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

import com.android.wm.shell.sysui.ShellController;
@@ -111,7 +110,7 @@ public class TvSplitScreenController extends SplitScreenController { 
        return new TvStageCoordinator(mContext, DEFAULT_DISPLAY, mSyncQueue,

                mTaskOrganizer, mDisplayController, mDisplayImeController,

                mDisplayInsetsController, mTransitions, mTransactionPool,

                new SplitscreenEventLogger(), mIconProvider, mMainExecutor, mMainHandler,

                mIconProvider, mMainExecutor, mMainHandler,

                mRecentTasksOptional, mSystemWindows);

    }

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

+2 −3
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import com.android.wm.shell.common.SystemWindows; 
import com.android.wm.shell.common.TransactionPool;

import com.android.wm.shell.common.split.SplitScreenConstants;

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

import com.android.wm.shell.splitscreen.SplitscreenEventLogger;

import com.android.wm.shell.splitscreen.StageCoordinator;

import com.android.wm.shell.transition.Transitions;
@@ -48,13 +47,13 @@ public class TvStageCoordinator extends StageCoordinator 
            ShellTaskOrganizer taskOrganizer, DisplayController displayController,

            DisplayImeController displayImeController,

            DisplayInsetsController displayInsetsController, Transitions transitions,

            TransactionPool transactionPool, SplitscreenEventLogger logger,

            TransactionPool transactionPool,

            IconProvider iconProvider, ShellExecutor mainExecutor,

            Handler mainHandler,

            Optional<RecentTasksController> recentTasks,

            SystemWindows systemWindows) {

        super(context, displayId, syncQueue, taskOrganizer, displayController, displayImeController,

                displayInsetsController, transitions, transactionPool, logger, iconProvider,

                displayInsetsController, transitions, transactionPool, iconProvider,

                mainExecutor, recentTasks);



        mTvSplitMenuController = new TvSplitMenuController(context, 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();