From 5b2ab551a62054794944c64f08cfc9a3804aa699 Mon Sep 17 00:00:00 2001 From: Vinit Nayak Date: Thu, 10 Oct 2024 18:28:35 -0700 Subject: Remove unused API removeFromSideStage Bug: 349828130 Test: Compiles Flag: EXEMPT refactor Change-Id: I8a859e3f600de0d4233c33f8446aef8c710dc01d --- .../com/android/wm/shell/splitscreen/ISplitScreen.aidl | 5 ----- .../wm/shell/splitscreen/SplitScreenController.java | 10 ---------- .../shell/splitscreen/SplitScreenShellCommandHandler.java | 15 --------------- .../android/wm/shell/splitscreen/StageCoordinator.java | 15 --------------- .../wm/shell/splitscreen/StageCoordinatorTests.java | 11 ----------- 5 files changed, 56 deletions(-) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/ISplitScreen.aidl b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/ISplitScreen.aidl index 59aa7926ce8f..cf2c3dafed80 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/ISplitScreen.aidl +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/ISplitScreen.aidl @@ -54,11 +54,6 @@ interface ISplitScreen { */ oneway void unregisterSplitSelectListener(in ISplitSelectListener listener) = 21; - /** - * Removes a task from the side stage. - */ - oneway void removeFromSideStage(int taskId) = 4; - /** * Removes the split-screen stages and leaving indicated task to top. Passing INVALID_TASK_ID * to indicate leaving no top task after leaving split-screen. 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 87b661d340ed..facd8866817c 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 @@ -378,10 +378,6 @@ public class SplitScreenController implements SplitDragPolicy.Starter, return mStageCoordinator.moveToStage(task, stagePosition, wct); } - public boolean removeFromSideStage(int taskId) { - return mStageCoordinator.removeFromSideStage(taskId); - } - public void setSideStagePosition(@SplitPosition int sideStagePosition) { mStageCoordinator.setSideStagePosition(sideStagePosition, null /* wct */); } @@ -1176,12 +1172,6 @@ public class SplitScreenController implements SplitDragPolicy.Starter, (controller) -> controller.exitSplitScreenOnHide(exitSplitScreenOnHide)); } - @Override - public void removeFromSideStage(int taskId) { - executeRemoteCallWithTaskPermission(mController, "removeFromSideStage", - (controller) -> controller.removeFromSideStage(taskId)); - } - @Override public void startTask(int taskId, int position, @Nullable Bundle options) { executeRemoteCallWithTaskPermission(mController, "startTask", diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenShellCommandHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenShellCommandHandler.java index e1b474d9804a..a016a84616c3 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenShellCommandHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenShellCommandHandler.java @@ -40,8 +40,6 @@ public class SplitScreenShellCommandHandler implements switch (args[0]) { case "moveToSideStage": return runMoveToSideStage(args, pw); - case "removeFromSideStage": - return runRemoveFromSideStage(args, pw); case "setSideStagePosition": return runSetSideStagePosition(args, pw); case "switchSplitPosition": @@ -67,17 +65,6 @@ public class SplitScreenShellCommandHandler implements return true; } - private boolean runRemoveFromSideStage(String[] args, PrintWriter pw) { - if (args.length < 2) { - // First argument is the action name. - pw.println("Error: task id should be provided as arguments"); - return false; - } - final int taskId = new Integer(args[1]); - mController.removeFromSideStage(taskId); - return true; - } - private boolean runSetSideStagePosition(String[] args, PrintWriter pw) { if (args.length < 2) { // First argument is the action name. @@ -109,8 +96,6 @@ public class SplitScreenShellCommandHandler implements public void printShellCommandHelp(PrintWriter pw, String prefix) { pw.println(prefix + "moveToSideStage "); pw.println(prefix + " Move a task with given id in split-screen mode."); - pw.println(prefix + "removeFromSideStage "); - pw.println(prefix + " Remove a task with given id in split-screen mode."); pw.println(prefix + "setSideStagePosition "); pw.println(prefix + " Sets the position of the side-stage."); pw.println(prefix + "switchSplitPosition"); 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 e527c02e0dec..47c5eec8cbd1 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 @@ -499,21 +499,6 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, return true; } - boolean removeFromSideStage(int taskId) { - ProtoLog.d(WM_SHELL_SPLIT_SCREEN, "removeFromSideStage: task=%d", taskId); - final WindowContainerTransaction wct = new WindowContainerTransaction(); - - - // MainStage will be deactivated in onStageHasChildrenChanged() if the other stages - // no longer have children. - - final boolean result = mSideStage.removeTask(taskId, - isSplitActive() ? mMainStage.mRootTaskInfo.token : null, - wct); - mTaskOrganizer.applyTransaction(wct); - return result; - } - SplitscreenEventLogger getLogger() { return mLogger; } 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 67eda8bfecd1..a6e33e5e7c29 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 @@ -231,17 +231,6 @@ public class StageCoordinatorTests extends ShellTestCase { verify(listener).onSplitBoundsChanged(mRootBounds, mBounds1, mBounds2); } - @Test - public void testRemoveFromSideStage() { - final ActivityManager.RunningTaskInfo task = new TestRunningTaskInfoBuilder().build(); - - doReturn(false).when(mMainStage).isActive(); - mStageCoordinator.removeFromSideStage(task.taskId); - - verify(mSideStage).removeTask( - eq(task.taskId), any(), any(WindowContainerTransaction.class)); - } - @Test public void testResolveStartStage_beforeSplitActivated_setsStagePosition() { mStageCoordinator.setSideStagePosition(SPLIT_POSITION_TOP_OR_LEFT, null /* wct */); -- cgit v1.2.3-59-g8ed1b