From 3a2d6214294548e265990aebb40e119bf453b752 Mon Sep 17 00:00:00 2001 From: Tony Huang Date: Tue, 15 Feb 2022 15:57:02 +0800 Subject: [PATCH] Refactor startIntentAndTaskWithLegacyTransition Param intentFirst is not necessary because we could use stagePosition to ensure intent side is left or right. Remove it and ensure start task on main stage at split side. Bug: 218613028 Test: pass existing tests Test: manual Change-Id: I3b8fc74b18c4d48fe73b501be696c3d59677183b --- quickstep/src/com/android/quickstep/SystemUiProxy.java | 9 ++++----- .../quickstep/util/SplitSelectStateController.java | 5 ++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java index 4aa69d1d1a..d28796c89e 100644 --- a/quickstep/src/com/android/quickstep/SystemUiProxy.java +++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java @@ -609,14 +609,13 @@ public class SystemUiProxy implements ISystemUiProxy, } public void startIntentAndTaskWithLegacyTransition(PendingIntent pendingIntent, - Intent fillInIntent, int taskId, boolean intentFirst, Bundle mainOptions, - Bundle sideOptions, @SplitConfigurationOptions.StagePosition int sidePosition, - float splitRatio, RemoteAnimationAdapter adapter) { + Intent fillInIntent, int taskId, Bundle mainOptions, Bundle sideOptions, + @SplitConfigurationOptions.StagePosition int sidePosition, float splitRatio, + RemoteAnimationAdapter adapter) { if (mSystemUiProxy != null) { try { mSplitScreen.startIntentAndTaskWithLegacyTransition(pendingIntent, fillInIntent, - taskId, intentFirst, mainOptions, sideOptions, sidePosition, splitRatio, - adapter); + taskId, mainOptions, sideOptions, sidePosition, splitRatio, adapter); } catch (RemoteException e) { Log.w(TAG, "Failed call startTasksWithLegacyTransition"); } diff --git a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java index e856d8a797..fff55a11c0 100644 --- a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java +++ b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java @@ -156,9 +156,8 @@ public class SplitSelectStateController { splitRatio, adapter); } else { mSystemUiProxy.startIntentAndTaskWithLegacyTransition(taskPendingIntent, - new Intent(), taskId2, stagePosition == STAGE_POSITION_TOP_OR_LEFT, - mainOpts.toBundle(), null /* sideOptions */, STAGE_POSITION_BOTTOM_OR_RIGHT, - splitRatio, adapter); + new Intent(), taskId2, mainOpts.toBundle(), null /* sideOptions */, + stagePosition, splitRatio, adapter); } } }