Merge "Only handle transition requests in split if active and visible" into udc-dev am: b88da3e9fc am: 53a5708a35

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

Change-Id: I2e84b7bd88460bee2994c45f206e31da1a5fa9fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Winson Chung
2023-06-17 06:46:21 +00:00
committed by Automerger Merge Worker

View File

@@ -2377,6 +2377,11 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
prepareExitSplitScreen(STAGE_TYPE_UNDEFINED, out);
}
}
// When split in the background, it should be only opening/dismissing transition and
// would keep out not empty. Prevent intercepting all transitions for split screen when
// it is in the background and not identify to handle it.
return (!out.isEmpty() || isSplitScreenVisible()) ? out : null;
} else {
if (isOpening && getStageOfTask(triggerTask) != null) {
// One task is appearing into split, prepare to enter split screen.
@@ -2385,8 +2390,8 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
mSplitTransitions.setEnterTransition(transition, request.getRemoteTransition(),
TRANSIT_SPLIT_SCREEN_PAIR_OPEN, !mIsDropEntering);
}
return out;
}
return out;
}
/**