Merge "Default divider interaction to true if transition doesn't succeed" into main (c835e984) · Commits · e / os / android_frameworks_base

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -388,6 +388,7 @@ class SplitScreenTransitions {

		IBinder startResizeTransition(WindowContainerTransaction wct,
		Transitions.TransitionHandler handler,
		@Nullable TransitionConsumedCallback consumedCallback,
		@Nullable TransitionFinishedCallback finishCallback) {
		if (mPendingResize != null) {
		mPendingResize.cancel(null);
		@@ -396,13 +397,14 @@ class SplitScreenTransitions {
		}

		IBinder transition = mTransitions.startTransition(TRANSIT_CHANGE, wct, handler);
		setResizeTransition(transition, finishCallback);
		setResizeTransition(transition, consumedCallback, finishCallback);
		return transition;
		}

		void setResizeTransition(@NonNull IBinder transition,
		@Nullable TransitionConsumedCallback consumedCallback,
		@Nullable TransitionFinishedCallback finishCallback) {
		mPendingResize = new TransitSession(transition, null /* consumedCb */, finishCallback);
		mPendingResize = new TransitSession(transition, consumedCallback, finishCallback);
		ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " splitTransition "
		+ " deduced Resize split screen");
		}

+5 −2

Original line number	Diff line number	Diff line
		@@ -2236,8 +2236,11 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		sendOnBoundsChanged();
		if (ENABLE_SHELL_TRANSITIONS) {
		mSplitLayout.setDividerInteractive(false, false, "onSplitResizeStart");
		mSplitTransitions.startResizeTransition(wct, this, (finishWct, t) ->
		mSplitLayout.setDividerInteractive(true, false, "onSplitResizeFinish"));
		mSplitTransitions.startResizeTransition(wct, this, (aborted) -> {
		mSplitLayout.setDividerInteractive(true, false, "onSplitResizeConsumed");
		}, (finishWct, t) -> {
		mSplitLayout.setDividerInteractive(true, false, "onSplitResizeFinish");
		});
		} else {
		// Only need screenshot for legacy case because shell transition should screenshot
		// itself during transition.