From 8ac0ae76e09b38c7d6ca177879d5801acdc8030e Mon Sep 17 00:00:00 2001 From: Ivan Makarov Date: Mon, 29 Aug 2022 17:02:23 +0000 Subject: [PATCH] Move SplitscreenEventLogger to StageCoordinator Currently, the SplitscreenEventLogger is declared as private final and initialized in constructor of the SplitScreenController and not used anywhere else in the SplitScreenController. Moved the initialization to the StageCoordinator and removed the field from SplitScreenController. Bug: 245650570 Test: atest SplitTransitionTests Test: atest SplitScreenControllerTests Test: atest StageCoordinatorTests Change-Id: Iedc8893982f3bc4ba4c41f6a394f5fdf39098a99 Merged-In: Iedc8893982f3bc4ba4c41f6a394f5fdf39098a99 --- .../wm/shell/splitscreen/SplitScreenController.java | 4 +--- .../android/wm/shell/splitscreen/StageCoordinator.java | 8 ++++---- .../com/android/wm/shell/splitscreen/SplitTestUtils.java | 4 ++-- .../wm/shell/splitscreen/SplitTransitionTests.java | 3 +-- .../wm/shell/splitscreen/StageCoordinatorTests.java | 4 +--- 5 files changed, 9 insertions(+), 14 deletions(-) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java index 872916197854e..9206afb00e276 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java @@ -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 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); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java index f8b40be6928a3..9c9841f33f888 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java @@ -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 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 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); diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitTestUtils.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitTestUtils.java index a67853cfe745c..ae69b3ddd0428 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitTestUtils.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitTestUtils.java @@ -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 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(); diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitTransitionTests.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitTransitionTests.java index 1d038f4ee3771..ea0033ba4bbb6 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitTransitionTests.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/SplitTransitionTests.java @@ -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) invocation -> mock(IBinder.class)) .when(mTransitions).startTransition(anyInt(), any(), any()); diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageCoordinatorTests.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageCoordinatorTests.java index 4b68870d4129f..ea9390ee8efd8 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageCoordinatorTests.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageCoordinatorTests.java @@ -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());