Merge "Hide smart actions if we enter split select from home" into tm-qpr-dev am: b26e558cb0

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21430441

Change-Id: I5b381a5253b052e3bee8c77da42edc4fc56efe50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-02-17 00:03:02 +00:00
committed by Automerger Merge Worker

View File

@@ -1624,10 +1624,13 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
// If we are entering Overview as a result of initiating a split from somewhere else
// (e.g. split from Home), we need to make sure the staged app is not drawn as a thumbnail.
int stagedTaskIdToBeRemovedFromGrid = mSplitSelectSource != null
? mSplitSelectSource.alreadyRunningTaskId
: INVALID_TASK_ID;
int stagedTaskIdToBeRemovedFromGrid;
if (mSplitSelectSource != null) {
stagedTaskIdToBeRemovedFromGrid = mSplitSelectSource.alreadyRunningTaskId;
updateCurrentTaskActionsVisibility();
} else {
stagedTaskIdToBeRemovedFromGrid = INVALID_TASK_ID;
}
// update the map of instance counts
mFilterState.updateInstanceCountMap(taskGroups);