Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move SplitscreenEventLogger to StageCoordinator" into tm-qpr-dev

Browse Source
This commit is contained in:
Ivan Makarov
2022-09-09 11:36:05 +00:00
committed by Android (Google) Code Review
parent 0ae95adba6 8ac0ae76e0
commit bd8d6fc437
5 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,7 +147,6 @@ public class SplitScreenController implements DragAndDropPolicy.Starter,
private final DragAndDropController mDragAndDropController; private final DragAndDropController mDragAndDropController;
private final Transitions mTransitions; private final Transitions mTransitions;
private final TransactionPool mTransactionPool; private final TransactionPool mTransactionPool;
private final SplitscreenEventLogger mLogger;
private final IconProvider mIconProvider; private final IconProvider mIconProvider;
private final Optional<RecentTasksController> mRecentTasksOptional; private final Optional<RecentTasksController> mRecentTasksOptional;
private final SplitScreenShellCommandHandler mSplitScreenShellCommandHandler; private final SplitScreenShellCommandHandler mSplitScreenShellCommandHandler;
@@ -186,7 +185,6 @@ public class SplitScreenController implements DragAndDropPolicy.Starter,
mDragAndDropController = dragAndDropController; mDragAndDropController = dragAndDropController;
mTransitions = transitions; mTransitions = transitions;
mTransactionPool = transactionPool; mTransactionPool = transactionPool;
mLogger = new SplitscreenEventLogger();
mIconProvider = iconProvider; mIconProvider = iconProvider;
mRecentTasksOptional = recentTasks; mRecentTasksOptional = recentTasks;
mSplitScreenShellCommandHandler = new SplitScreenShellCommandHandler(this); mSplitScreenShellCommandHandler = new SplitScreenShellCommandHandler(this);
@@ -221,7 +219,7 @@ public class SplitScreenController implements DragAndDropPolicy.Starter,
protected StageCoordinator createStageCoordinator() { protected StageCoordinator createStageCoordinator() {
return new StageCoordinator(mContext, DEFAULT_DISPLAY, mSyncQueue, return new StageCoordinator(mContext, DEFAULT_DISPLAY, mSyncQueue,
mTaskOrganizer, mDisplayController, mDisplayImeController, mTaskOrganizer, mDisplayController, mDisplayImeController,
mDisplayInsetsController, mTransitions, mTransactionPool, mLogger, mDisplayInsetsController, mTransitions, mTransactionPool,
mIconProvider, mMainExecutor, mRecentTasksOptional); mIconProvider, mMainExecutor, mRecentTasksOptional);
} }

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

@@ -250,14 +250,14 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
ShellTaskOrganizer taskOrganizer, DisplayController displayController, ShellTaskOrganizer taskOrganizer, DisplayController displayController,
DisplayImeController displayImeController, DisplayImeController displayImeController,
DisplayInsetsController displayInsetsController, Transitions transitions, DisplayInsetsController displayInsetsController, Transitions transitions,
TransactionPool transactionPool, SplitscreenEventLogger logger, TransactionPool transactionPool,
IconProvider iconProvider, ShellExecutor mainExecutor, IconProvider iconProvider, ShellExecutor mainExecutor,
Optional<RecentTasksController> recentTasks) { Optional<RecentTasksController> recentTasks) {
mContext = context; mContext = context;
mDisplayId = displayId; mDisplayId = displayId;
mSyncQueue = syncQueue; mSyncQueue = syncQueue;
mTaskOrganizer = taskOrganizer; mTaskOrganizer = taskOrganizer;
mLogger = logger; mLogger = new SplitscreenEventLogger();
mMainExecutor = mainExecutor; mMainExecutor = mainExecutor;
mRecentTasks = recentTasks; mRecentTasks = recentTasks;
@@ -301,7 +301,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
DisplayController displayController, DisplayImeController displayImeController, DisplayController displayController, DisplayImeController displayImeController,
DisplayInsetsController displayInsetsController, SplitLayout splitLayout, DisplayInsetsController displayInsetsController, SplitLayout splitLayout,
Transitions transitions, TransactionPool transactionPool, Transitions transitions, TransactionPool transactionPool,
SplitscreenEventLogger logger, ShellExecutor mainExecutor, ShellExecutor mainExecutor,
Optional<RecentTasksController> recentTasks) { Optional<RecentTasksController> recentTasks) {
mContext = context; mContext = context;
mDisplayId = displayId; mDisplayId = displayId;
@@ -316,7 +316,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
mSplitLayout = splitLayout; mSplitLayout = splitLayout;
mSplitTransitions = new SplitScreenTransitions(transactionPool, transitions, mSplitTransitions = new SplitScreenTransitions(transactionPool, transitions,
this::onTransitionAnimationComplete, this); this::onTransitionAnimationComplete, this);
mLogger = logger; mLogger = new SplitscreenEventLogger();
mMainExecutor = mainExecutor; mMainExecutor = mainExecutor;
mRecentTasks = recentTasks; mRecentTasks = recentTasks;
mDisplayController.addDisplayWindowListener(this); mDisplayController.addDisplayWindowListener(this);

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

@@ -71,11 +71,11 @@ public class SplitTestUtils {
DisplayController displayController, DisplayImeController imeController, DisplayController displayController, DisplayImeController imeController,
DisplayInsetsController insetsController, SplitLayout splitLayout, DisplayInsetsController insetsController, SplitLayout splitLayout,
Transitions transitions, TransactionPool transactionPool, Transitions transitions, TransactionPool transactionPool,
SplitscreenEventLogger logger, ShellExecutor mainExecutor, ShellExecutor mainExecutor,
Optional<RecentTasksController> recentTasks) { Optional<RecentTasksController> recentTasks) {
super(context, displayId, syncQueue, taskOrganizer, mainStage, super(context, displayId, syncQueue, taskOrganizer, mainStage,
sideStage, displayController, imeController, insetsController, splitLayout, sideStage, displayController, imeController, insetsController, splitLayout,
transitions, transactionPool, logger, mainExecutor, recentTasks); transitions, transactionPool, mainExecutor, recentTasks);
// Prepare root task for testing. // Prepare root task for testing.
mRootTask = new TestRunningTaskInfoBuilder().build(); mRootTask = new TestRunningTaskInfoBuilder().build();

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

@@ -95,7 +95,6 @@ public class SplitTransitionTests extends ShellTestCase {
@Mock private TransactionPool mTransactionPool; @Mock private TransactionPool mTransactionPool;
@Mock private Transitions mTransitions; @Mock private Transitions mTransitions;
@Mock private SurfaceSession mSurfaceSession; @Mock private SurfaceSession mSurfaceSession;
@Mock private SplitscreenEventLogger mLogger;
@Mock private IconProvider mIconProvider; @Mock private IconProvider mIconProvider;
@Mock private ShellExecutor mMainExecutor; @Mock private ShellExecutor mMainExecutor;
private SplitLayout mSplitLayout; private SplitLayout mSplitLayout;
@@ -127,7 +126,7 @@ public class SplitTransitionTests extends ShellTestCase {
mStageCoordinator = new SplitTestUtils.TestStageCoordinator(mContext, DEFAULT_DISPLAY, mStageCoordinator = new SplitTestUtils.TestStageCoordinator(mContext, DEFAULT_DISPLAY,
mSyncQueue, mTaskOrganizer, mMainStage, mSideStage, mDisplayController, mSyncQueue, mTaskOrganizer, mMainStage, mSideStage, mDisplayController,
mDisplayImeController, mDisplayInsetsController, mSplitLayout, mTransitions, mDisplayImeController, mDisplayInsetsController, mSplitLayout, mTransitions,
mTransactionPool, mLogger, mMainExecutor, Optional.empty()); mTransactionPool, mMainExecutor, Optional.empty());
mSplitScreenTransitions = mStageCoordinator.getSplitTransitions(); mSplitScreenTransitions = mStageCoordinator.getSplitTransitions();
doAnswer((Answer<IBinder>) invocation -> mock(IBinder.class)) doAnswer((Answer<IBinder>) invocation -> mock(IBinder.class))
.when(mTransitions).startTransition(anyInt(), any(), any()); .when(mTransitions).startTransition(anyInt(), any(), any());

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

@@ -97,8 +97,6 @@ public class StageCoordinatorTests extends ShellTestCase {
@Mock @Mock
private TransactionPool mTransactionPool; private TransactionPool mTransactionPool;
@Mock @Mock
private SplitscreenEventLogger mLogger;
@Mock
private ShellExecutor mMainExecutor; private ShellExecutor mMainExecutor;
private final Rect mBounds1 = new Rect(10, 20, 30, 40); private final Rect mBounds1 = new Rect(10, 20, 30, 40);
@@ -115,7 +113,7 @@ public class StageCoordinatorTests extends ShellTestCase {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mStageCoordinator = spy(new StageCoordinator(mContext, DEFAULT_DISPLAY, mSyncQueue, mStageCoordinator = spy(new StageCoordinator(mContext, DEFAULT_DISPLAY, mSyncQueue,
mTaskOrganizer, mMainStage, mSideStage, mDisplayController, mDisplayImeController, mTaskOrganizer, mMainStage, mSideStage, mDisplayController, mDisplayImeController,
mDisplayInsetsController, mSplitLayout, mTransitions, mTransactionPool, mLogger, mDisplayInsetsController, mSplitLayout, mTransitions, mTransactionPool,
mMainExecutor, Optional.empty())); mMainExecutor, Optional.empty()));
doNothing().when(mStageCoordinator).updateActivityOptions(any(), anyInt()); doNothing().when(mStageCoordinator).updateActivityOptions(any(), anyInt());