Merge "Only handle transition requests in split if active and visible" into udc-dev (b88da3e9) · Commits · e / os / android_frameworks_base

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

+6 −1

Original line number	Diff line number	Diff line
		@@ -2365,6 +2365,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.
		@@ -2373,9 +2378,9 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		mSplitTransitions.setEnterTransition(transition, request.getRemoteTransition(),
		TRANSIT_SPLIT_SCREEN_PAIR_OPEN, !mIsDropEntering);
		}
		}
		return out;
		}
		}

		/**
		* This is used for mixed scenarios. For such scenarios, just make sure to include exiting