From d9cb8cfa0d5d25eccf424a0644d81fd6d088afa0 Mon Sep 17 00:00:00 2001 From: Tracy Zhou Date: Wed, 2 Mar 2022 22:13:01 -0800 Subject: [PATCH] Support launching an intent and a task from the same app as multi-instance Similar to ag/16820166, add FLAG_ACTIVITY_MULTIPLE_TASK to the fillInIntent Fixes: 222583964 Fixes: 217965464 Fixes: 221415250 Test: https://recall.googleplex.com/projects/f46cfe9c-8076-4efe-bf8a-b1cc4f1f5e1b/sessions/7606236a-3350-49d6-bfad-9e6a609413d1 Change-Id: I676358ef1cbff8317995430de961a0a3242c0cbf --- .../launcher3/BaseQuickstepLauncher.java | 4 +- .../android/quickstep/RecentsActivity.java | 4 +- .../util/SplitSelectStateController.java | 66 ++++++++++++++----- .../quickstep/views/GroupedTaskView.java | 5 +- .../android/quickstep/views/RecentsView.java | 34 +--------- 5 files changed, 58 insertions(+), 55 deletions(-) diff --git a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java index 8fb085dd16..cf932b7c94 100644 --- a/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java +++ b/quickstep/src/com/android/launcher3/BaseQuickstepLauncher.java @@ -295,8 +295,8 @@ public abstract class BaseQuickstepLauncher extends Launcher { mActionsView = findViewById(R.id.overview_actions_view); RecentsView overviewPanel = (RecentsView) getOverviewPanel(); SplitSelectStateController controller = - new SplitSelectStateController(mHandler, SystemUiProxy.INSTANCE.get(this), - getStateManager(), getDepthController()); + new SplitSelectStateController(this, mHandler, getStateManager(), + getDepthController()); overviewPanel.init(mActionsView, controller); mActionsView.setDp(getDeviceProfile()); mActionsView.updateVerticalMargin(DisplayController.getNavigationMode(this)); diff --git a/quickstep/src/com/android/quickstep/RecentsActivity.java b/quickstep/src/com/android/quickstep/RecentsActivity.java index db92e339cd..3e7ad62233 100644 --- a/quickstep/src/com/android/quickstep/RecentsActivity.java +++ b/quickstep/src/com/android/quickstep/RecentsActivity.java @@ -135,8 +135,8 @@ public final class RecentsActivity extends StatefulActivity { SYSUI_PROGRESS.set(getRootView().getSysUiScrim(), 0f); SplitSelectStateController controller = - new SplitSelectStateController(mHandler, SystemUiProxy.INSTANCE.get(this), - getStateManager(), null /*depthController*/); + new SplitSelectStateController(this, mHandler, getStateManager(), + null /* depthController */); mDragLayer.recreateControllers(); mFallbackRecentsView.init(mActionsView, controller); diff --git a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java index fff55a11c0..21e3ea0f2c 100644 --- a/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java +++ b/quickstep/src/com/android/quickstep/util/SplitSelectStateController.java @@ -17,6 +17,7 @@ package com.android.quickstep.util; import static android.app.ActivityTaskManager.INVALID_TASK_ID; +import static android.app.PendingIntent.FLAG_MUTABLE; import static com.android.launcher3.Utilities.postAsyncCallback; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; @@ -27,9 +28,11 @@ import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITIO import android.app.ActivityOptions; import android.app.ActivityThread; import android.app.PendingIntent; +import android.content.Context; import android.content.Intent; import android.os.Handler; import android.os.IBinder; +import android.text.TextUtils; import android.view.RemoteAnimationAdapter; import android.view.SurfaceControl; import android.window.TransitionInfo; @@ -45,6 +48,7 @@ import com.android.quickstep.TaskAnimationManager; import com.android.quickstep.TaskViewUtils; import com.android.quickstep.views.GroupedTaskView; import com.android.quickstep.views.TaskView; +import com.android.systemui.shared.recents.model.Task; import com.android.systemui.shared.system.RemoteAnimationAdapterCompat; import com.android.systemui.shared.system.RemoteAnimationRunnerCompat; import com.android.systemui.shared.system.RemoteAnimationTargetCompat; @@ -59,12 +63,13 @@ import java.util.function.Consumer; */ public class SplitSelectStateController { + private final Context mContext; private final Handler mHandler; private final SystemUiProxy mSystemUiProxy; private final StateManager mStateManager; private final DepthController mDepthController; private @StagePosition int mStagePosition; - private PendingIntent mInitialTaskPendingIntent; + private Intent mInitialTaskIntent; private int mInitialTaskId = INVALID_TASK_ID; private int mSecondTaskId = INVALID_TASK_ID; private boolean mRecentsAnimationRunning; @@ -72,10 +77,11 @@ public class SplitSelectStateController { @Nullable private GroupedTaskView mLaunchingTaskView; - public SplitSelectStateController(Handler handler, SystemUiProxy systemUiProxy, - StateManager stateManager, DepthController depthController) { + public SplitSelectStateController(Context context, Handler handler, StateManager stateManager, + DepthController depthController) { + mContext = context; mHandler = handler; - mSystemUiProxy = systemUiProxy; + mSystemUiProxy = SystemUiProxy.INSTANCE.get(mContext); mStateManager = stateManager; mDepthController = depthController; } @@ -86,12 +92,11 @@ public class SplitSelectStateController { public void setInitialTaskSelect(int taskId, @StagePosition int stagePosition) { mInitialTaskId = taskId; mStagePosition = stagePosition; - mInitialTaskPendingIntent = null; + mInitialTaskIntent = null; } - public void setInitialTaskSelect(PendingIntent pendingIntent, - @StagePosition int stagePosition) { - mInitialTaskPendingIntent = pendingIntent; + public void setInitialTaskSelect(Intent intent, @StagePosition int stagePosition) { + mInitialTaskIntent = intent; mStagePosition = stagePosition; mInitialTaskId = INVALID_TASK_ID; } @@ -99,9 +104,22 @@ public class SplitSelectStateController { /** * To be called after second task selected */ - public void setSecondTaskId(int taskId, Consumer callback) { - mSecondTaskId = taskId; - launchTasks(mInitialTaskId, mInitialTaskPendingIntent, mSecondTaskId, mStagePosition, + public void setSecondTask(Task task, Consumer callback) { + mSecondTaskId = task.key.id; + final Intent fillInIntent; + if (mInitialTaskIntent != null) { + fillInIntent = new Intent(); + if (TextUtils.equals(mInitialTaskIntent.getComponent().getPackageName(), + task.topActivity.getPackageName())) { + fillInIntent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK); + } + } else { + fillInIntent = null; + } + final PendingIntent pendingIntent = + mInitialTaskIntent == null ? null : PendingIntent.getActivity(mContext, 0, + mInitialTaskIntent, FLAG_MUTABLE); + launchTasks(mInitialTaskId, pendingIntent, fillInIntent, mSecondTaskId, mStagePosition, callback, false /* freezeTaskList */, DEFAULT_SPLIT_RATIO); } @@ -113,18 +131,32 @@ public class SplitSelectStateController { mLaunchingTaskView = groupedTaskView; TaskView.TaskIdAttributeContainer[] taskIdAttributeContainers = groupedTaskView.getTaskIdAttributeContainers(); - launchTasks(taskIdAttributeContainers[0].getTask().key.id, null, + launchTasks(taskIdAttributeContainers[0].getTask().key.id, taskIdAttributeContainers[1].getTask().key.id, taskIdAttributeContainers[0].getStagePosition(), callback, freezeTaskList, groupedTaskView.getSplitRatio()); } /** + * To be called when we want to launch split pairs from Overview when split is initiated from + * Overview. + */ + public void launchTasks(int taskId1, int taskId2, @StagePosition int stagePosition, + Consumer callback, boolean freezeTaskList, float splitRatio) { + launchTasks(taskId1, null /* taskPendingIntent */, null /* fillInIntent */, taskId2, + stagePosition, callback, freezeTaskList, splitRatio); + } + + /** + * To be called when we want to launch split pairs from Overview. Split can be initiated from + * either Overview or home, or all apps. Either both taskIds are set, or a pending intent + a + * fill in intent with a taskId2 are set. + * @param taskPendingIntent is null when split is initiated from Overview * @param stagePosition representing location of task1 */ public void launchTasks(int taskId1, @Nullable PendingIntent taskPendingIntent, - int taskId2, @StagePosition int stagePosition, Consumer callback, - boolean freezeTaskList, float splitRatio) { + @Nullable Intent fillInIntent, int taskId2, @StagePosition int stagePosition, + Consumer callback, boolean freezeTaskList, float splitRatio) { // Assume initial task is for top/left part of screen final int[] taskIds = stagePosition == STAGE_POSITION_TOP_OR_LEFT ? new int[]{taskId1, taskId2} @@ -156,7 +188,7 @@ public class SplitSelectStateController { splitRatio, adapter); } else { mSystemUiProxy.startIntentAndTaskWithLegacyTransition(taskPendingIntent, - new Intent(), taskId2, mainOpts.toBundle(), null /* sideOptions */, + fillInIntent, taskId2, mainOpts.toBundle(), null /* sideOptions */, stagePosition, splitRatio, adapter); } } @@ -250,7 +282,7 @@ public class SplitSelectStateController { */ public void resetState() { mInitialTaskId = INVALID_TASK_ID; - mInitialTaskPendingIntent = null; + mInitialTaskIntent = null; mSecondTaskId = INVALID_TASK_ID; mStagePosition = SplitConfigurationOptions.STAGE_POSITION_UNDEFINED; mRecentsAnimationRunning = false; @@ -262,7 +294,7 @@ public class SplitSelectStateController { * chosen */ public boolean isSplitSelectActive() { - return (mInitialTaskId != INVALID_TASK_ID || mInitialTaskPendingIntent != null) + return (mInitialTaskId != INVALID_TASK_ID || mInitialTaskIntent != null) && mSecondTaskId == INVALID_TASK_ID; } } diff --git a/quickstep/src/com/android/quickstep/views/GroupedTaskView.java b/quickstep/src/com/android/quickstep/views/GroupedTaskView.java index 04af3c11ab..d9f668dd1b 100644 --- a/quickstep/src/com/android/quickstep/views/GroupedTaskView.java +++ b/quickstep/src/com/android/quickstep/views/GroupedTaskView.java @@ -182,9 +182,8 @@ public class GroupedTaskView extends TaskView { @Override public void launchTask(@NonNull Consumer callback, boolean freezeTaskList) { - getRecentsView().getSplitPlaceholder().launchTasks(mTask.key.id, null, - mSecondaryTask.key.id, STAGE_POSITION_TOP_OR_LEFT, callback, freezeTaskList, - getSplitRatio()); + getRecentsView().getSplitPlaceholder().launchTasks(mTask.key.id, mSecondaryTask.key.id, + STAGE_POSITION_TOP_OR_LEFT, callback, freezeTaskList, getSplitRatio()); } @Override diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index 5e331e2e86..a1cd2e17e1 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -16,7 +16,6 @@ package com.android.quickstep.views; -import static android.app.PendingIntent.FLAG_MUTABLE; import static android.view.Surface.ROTATION_0; import static android.view.View.MeasureSpec.EXACTLY; import static android.view.View.MeasureSpec.makeMeasureSpec; @@ -69,8 +68,6 @@ import android.animation.PropertyValuesHolder; import android.animation.ValueAnimator; import android.annotation.TargetApi; import android.app.ActivityManager.RunningTaskInfo; -import android.app.PendingIntent; -import android.content.ComponentName; import android.content.Context; import android.content.LocusId; import android.content.res.Configuration; @@ -2013,22 +2010,6 @@ public abstract class RecentsView - mSplitSelectStateController.setSecondTaskId(task.key.id, - aBoolean1 -> RecentsView.this.resetFromSplitSelectionState())); + mSplitSelectStateController.setSecondTask( + task, aBoolean1 -> RecentsView.this.resetFromSplitSelectionState())); if (containerTaskView.containsMultipleTasks()) { // If we are launching from a child task, then only hide the thumbnail itself mSecondSplitHiddenView = thumbnailView;