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

Merge "Remove stage concept from split screen APIs" into tm-qpr-dev am: f876fb9958

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

Change-Id: I42ed6f2407e91834769912430c1155c2971d3082
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jerry Chang
2022-10-07 05:05:26 +00:00
committed by Automerger Merge Worker
parent 602d511bac f876fb9958
commit 945c131545
3 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/ISplitScreen.aidl
View File

@@ -79,23 +79,23 @@ interface ISplitScreen {
/** /**
* Starts tasks simultaneously in one transition. * Starts tasks simultaneously in one transition.
*/ */
oneway void startTasks(int mainTaskId, in Bundle mainOptions, int sideTaskId, oneway void startTasks(int taskId1, in Bundle options1, int taskId2, in Bundle options2,
in Bundle sideOptions, int sidePosition, float splitRatio, int splitPosition, float splitRatio, in RemoteTransition remoteTransition,
in RemoteTransition remoteTransition, in InstanceId instanceId) = 10; in InstanceId instanceId) = 10;
/** /**
* Version of startTasks using legacy transition system. * Version of startTasks using legacy transition system.
*/ */
oneway void startTasksWithLegacyTransition(int mainTaskId, in Bundle mainOptions, oneway void startTasksWithLegacyTransition(int taskId1, in Bundle options1, int taskId2,
int sideTaskId, in Bundle sideOptions, int sidePosition, in Bundle options2, int splitPosition, float splitRatio,
float splitRatio, in RemoteAnimationAdapter adapter, in InstanceId instanceId) = 11; in RemoteAnimationAdapter adapter, in InstanceId instanceId) = 11;
/** /**
* Starts a pair of intent and task using legacy transition system. * Starts a pair of intent and task using legacy transition system.
*/ */
oneway void startIntentAndTaskWithLegacyTransition(in PendingIntent pendingIntent, oneway void startIntentAndTaskWithLegacyTransition(in PendingIntent pendingIntent,
in Intent fillInIntent, int taskId, in Bundle mainOptions,in Bundle sideOptions, in Intent fillInIntent, in Bundle options1, int taskId, in Bundle options2,
int sidePosition, float splitRatio, in RemoteAnimationAdapter adapter, int splitPosition, float splitRatio, in RemoteAnimationAdapter adapter,
in InstanceId instanceId) = 12; in InstanceId instanceId) = 12;
/** /**
@@ -115,7 +115,7 @@ interface ISplitScreen {
/** /**
* Starts a pair of shortcut and task using legacy transition system. * Starts a pair of shortcut and task using legacy transition system.
*/ */
oneway void startShortcutAndTaskWithLegacyTransition(in ShortcutInfo shortcutInfo, int taskId, oneway void startShortcutAndTaskWithLegacyTransition(in ShortcutInfo shortcutInfo,
in Bundle mainOptions, in Bundle sideOptions, int sidePosition, float splitRatio, in Bundle options1, int taskId, in Bundle options2, int splitPosition, float splitRatio,
in RemoteAnimationAdapter adapter, in InstanceId instanceId) = 15; in RemoteAnimationAdapter adapter, in InstanceId instanceId) = 15;
} }

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

@@ -828,47 +828,46 @@ public class SplitScreenController implements DragAndDropPolicy.Starter,
} }
@Override @Override
public void startTasksWithLegacyTransition(int mainTaskId, @Nullable Bundle mainOptions, public void startTasksWithLegacyTransition(int taskId1, @Nullable Bundle options1,
int sideTaskId, @Nullable Bundle sideOptions, @SplitPosition int sidePosition, int taskId2, @Nullable Bundle options2, @SplitPosition int splitPosition,
float splitRatio, RemoteAnimationAdapter adapter, InstanceId instanceId) { float splitRatio, RemoteAnimationAdapter adapter, InstanceId instanceId) {
executeRemoteCallWithTaskPermission(mController, "startTasks", executeRemoteCallWithTaskPermission(mController, "startTasks",
(controller) -> controller.mStageCoordinator.startTasksWithLegacyTransition( (controller) -> controller.mStageCoordinator.startTasksWithLegacyTransition(
mainTaskId, mainOptions, sideTaskId, sideOptions, sidePosition, taskId1, options1, taskId2, options2, splitPosition,
splitRatio, adapter, instanceId)); splitRatio, adapter, instanceId));
} }
@Override @Override
public void startIntentAndTaskWithLegacyTransition(PendingIntent pendingIntent, public void startIntentAndTaskWithLegacyTransition(PendingIntent pendingIntent,
Intent fillInIntent, int taskId, Bundle mainOptions, Bundle sideOptions, Intent fillInIntent, Bundle options1, int taskId, Bundle options2,
int sidePosition, float splitRatio, RemoteAnimationAdapter adapter, int splitPosition, float splitRatio, RemoteAnimationAdapter adapter,
InstanceId instanceId) { InstanceId instanceId) {
executeRemoteCallWithTaskPermission(mController, executeRemoteCallWithTaskPermission(mController,
"startIntentAndTaskWithLegacyTransition", (controller) -> "startIntentAndTaskWithLegacyTransition", (controller) ->
controller.mStageCoordinator.startIntentAndTaskWithLegacyTransition( controller.mStageCoordinator.startIntentAndTaskWithLegacyTransition(
pendingIntent, fillInIntent, taskId, mainOptions, sideOptions, pendingIntent, fillInIntent, options1, taskId, options2,
sidePosition, splitRatio, adapter, instanceId)); splitPosition, splitRatio, adapter, instanceId));
} }
@Override @Override
public void startShortcutAndTaskWithLegacyTransition(ShortcutInfo shortcutInfo, public void startShortcutAndTaskWithLegacyTransition(ShortcutInfo shortcutInfo,
int taskId, @Nullable Bundle mainOptions, @Nullable Bundle sideOptions, @Nullable Bundle options1, int taskId, @Nullable Bundle options2,
@SplitPosition int sidePosition, float splitRatio, RemoteAnimationAdapter adapter, @SplitPosition int splitPosition, float splitRatio, RemoteAnimationAdapter adapter,
InstanceId instanceId) { InstanceId instanceId) {
executeRemoteCallWithTaskPermission(mController, executeRemoteCallWithTaskPermission(mController,
"startShortcutAndTaskWithLegacyTransition", (controller) -> "startShortcutAndTaskWithLegacyTransition", (controller) ->
controller.mStageCoordinator.startShortcutAndTaskWithLegacyTransition( controller.mStageCoordinator.startShortcutAndTaskWithLegacyTransition(
shortcutInfo, taskId, mainOptions, sideOptions, sidePosition, shortcutInfo, options1, taskId, options2, splitPosition,
splitRatio, adapter, instanceId)); splitRatio, adapter, instanceId));
} }
@Override @Override
public void startTasks(int mainTaskId, @Nullable Bundle mainOptions, public void startTasks(int taskId1, @Nullable Bundle options1, int taskId2,
int sideTaskId, @Nullable Bundle sideOptions, @Nullable Bundle options2, @SplitPosition int splitPosition, float splitRatio,
@SplitPosition int sidePosition, float splitRatio,
@Nullable RemoteTransition remoteTransition, InstanceId instanceId) { @Nullable RemoteTransition remoteTransition, InstanceId instanceId) {
executeRemoteCallWithTaskPermission(mController, "startTasks", executeRemoteCallWithTaskPermission(mController, "startTasks",
(controller) -> controller.mStageCoordinator.startTasks(mainTaskId, mainOptions, (controller) -> controller.mStageCoordinator.startTasks(taskId1, options1,
sideTaskId, sideOptions, sidePosition, splitRatio, remoteTransition, taskId2, options2, splitPosition, splitRatio, remoteTransition,
instanceId)); instanceId));
} }

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

@@ -516,8 +516,8 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
} }
/** Starts 2 tasks in one transition. */ /** Starts 2 tasks in one transition. */
void startTasks(int mainTaskId, @Nullable Bundle mainOptions, int sideTaskId, void startTasks(int sideTaskId, @Nullable Bundle sideOptions, int mainTaskId,
@Nullable Bundle sideOptions, @SplitPosition int sidePosition, float splitRatio, @Nullable Bundle mainOptions, @SplitPosition int sidePosition, float splitRatio,
@Nullable RemoteTransition remoteTransition, InstanceId instanceId) { @Nullable RemoteTransition remoteTransition, InstanceId instanceId) {
final WindowContainerTransaction wct = new WindowContainerTransaction(); final WindowContainerTransaction wct = new WindowContainerTransaction();
mainOptions = mainOptions != null ? mainOptions : new Bundle(); mainOptions = mainOptions != null ? mainOptions : new Bundle();
@@ -550,44 +550,45 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
setEnterInstanceId(instanceId); setEnterInstanceId(instanceId);
} }
/** Starts 2 tasks in one legacy transition. */ /** Starts a pair of tasks using legacy transition. */
void startTasksWithLegacyTransition(int mainTaskId, @Nullable Bundle mainOptions, void startTasksWithLegacyTransition(int taskId1, @Nullable Bundle options1,
int sideTaskId, @Nullable Bundle sideOptions, @SplitPosition int sidePosition, int taskId2, @Nullable Bundle options2, @SplitPosition int splitPosition,
float splitRatio, RemoteAnimationAdapter adapter, float splitRatio, RemoteAnimationAdapter adapter,
InstanceId instanceId) { InstanceId instanceId) {
final WindowContainerTransaction wct = new WindowContainerTransaction(); final WindowContainerTransaction wct = new WindowContainerTransaction();
if (sideOptions == null) sideOptions = new Bundle(); if (options1 == null) options1 = new Bundle();
addActivityOptions(sideOptions, mSideStage); addActivityOptions(options1, mSideStage);
wct.startTask(sideTaskId, sideOptions); wct.startTask(taskId1, options1);
startWithLegacyTransition(wct, mainTaskId, mainOptions, sidePosition, splitRatio, adapter, startWithLegacyTransition(wct, taskId2, options2, splitPosition, splitRatio, adapter,
instanceId); instanceId);
} }
/** Start an intent and a task ordered by {@code intentFirst}. */ /** Starts a pair of intent and task using legacy transition. */
void startIntentAndTaskWithLegacyTransition(PendingIntent pendingIntent, Intent fillInIntent, void startIntentAndTaskWithLegacyTransition(PendingIntent pendingIntent, Intent fillInIntent,
int taskId, @Nullable Bundle mainOptions, @Nullable Bundle sideOptions, @Nullable Bundle options1, int taskId, @Nullable Bundle options2,
@SplitPosition int sidePosition, float splitRatio, RemoteAnimationAdapter adapter, @SplitPosition int splitPosition, float splitRatio, RemoteAnimationAdapter adapter,
InstanceId instanceId) { InstanceId instanceId) {
final WindowContainerTransaction wct = new WindowContainerTransaction(); final WindowContainerTransaction wct = new WindowContainerTransaction();
if (sideOptions == null) sideOptions = new Bundle(); if (options1 == null) options1 = new Bundle();
addActivityOptions(sideOptions, mSideStage); addActivityOptions(options1, mSideStage);
wct.sendPendingIntent(pendingIntent, fillInIntent, sideOptions); wct.sendPendingIntent(pendingIntent, fillInIntent, options1);
startWithLegacyTransition(wct, taskId, mainOptions, sidePosition, splitRatio, adapter, startWithLegacyTransition(wct, taskId, options2, splitPosition, splitRatio, adapter,
instanceId); instanceId);
} }
/** Starts a pair of shortcut and task using legacy transition. */
void startShortcutAndTaskWithLegacyTransition(ShortcutInfo shortcutInfo, void startShortcutAndTaskWithLegacyTransition(ShortcutInfo shortcutInfo,
int taskId, @Nullable Bundle mainOptions, @Nullable Bundle sideOptions, @Nullable Bundle options1, int taskId, @Nullable Bundle options2,
@SplitPosition int sidePosition, float splitRatio, RemoteAnimationAdapter adapter, @SplitPosition int splitPosition, float splitRatio, RemoteAnimationAdapter adapter,
InstanceId instanceId) { InstanceId instanceId) {
final WindowContainerTransaction wct = new WindowContainerTransaction(); final WindowContainerTransaction wct = new WindowContainerTransaction();
if (sideOptions == null) sideOptions = new Bundle(); if (options1 == null) options1 = new Bundle();
addActivityOptions(sideOptions, mSideStage); addActivityOptions(options1, mSideStage);
wct.startShortcut(mContext.getPackageName(), shortcutInfo, sideOptions); wct.startShortcut(mContext.getPackageName(), shortcutInfo, options1);
startWithLegacyTransition(wct, taskId, mainOptions, sidePosition, splitRatio, adapter, startWithLegacyTransition(wct, taskId, options2, splitPosition, splitRatio, adapter,
instanceId); instanceId);
} }