Merge "Clean up Split Decor on aborted resizing transition" into main (0e14209a) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitDecorManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -667,7 +667,7 @@ public class SplitDecorManager extends WindowlessWindowManager {
		}

		/** Release or hide decor hint. */
		private void releaseDecor(SurfaceControl.Transaction t) {
		public void releaseDecor(SurfaceControl.Transaction t) {
		if (mBackgroundLeash != null) {
		t.remove(mBackgroundLeash);
		mBackgroundLeash = null;

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

+9 −16

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import static android.view.WindowManager.TRANSIT_CLOSE;
		import static android.view.WindowManager.TRANSIT_OPEN;
		import static android.view.WindowManager.TRANSIT_TO_BACK;

		import static com.android.wm.shell.Flags.enableFlexibleSplit;
		import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_SPLIT_SCREEN;
		import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_TRANSITIONS;
		import static com.android.wm.shell.shared.animation.Interpolators.ALPHA_IN;
		@@ -446,7 +445,6 @@ class SplitScreenTransitions {
		Transitions.TransitionHandler handler,
		@Nullable TransitionConsumedCallback consumedCallback,
		@Nullable TransitionFinishedCallback finishCallback,
		@Nullable SplitDecorManager mainDecor, @Nullable SplitDecorManager sideDecor,
		@Nullable List<SplitDecorManager> decorManagers) {
		ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS,
		" splitTransition deduced Resize split screen.");
		@@ -454,14 +452,9 @@ class SplitScreenTransitions {
		mPendingResize != null);
		if (mPendingResize != null) {
		mPendingResize.cancel(null);
		if (enableFlexibleSplit()) {
		for (SplitDecorManager stage : decorManagers) {
		stage.cancelRunningAnimations();
		}
		} else {
		mainDecor.cancelRunningAnimations();
		sideDecor.cancelRunningAnimations();
		}
		mAnimations.clear();
		onFinish(null /* wct */);
		}
		@@ -506,20 +499,20 @@ class SplitScreenTransitions {
		mStageCoordinator.finishEnterSplitScreen(finishT);
		}

		mPendingEnter.onConsumed(aborted);
		mPendingEnter.onConsumed(aborted, finishT);
		mPendingEnter = null;
		mStageCoordinator.notifySplitAnimationStatus(false /animationRunning/);
		ProtoLog.d(WM_SHELL_SPLIT_SCREEN, "onTransitionConsumed for enter transition");
		} else if (isPendingDismiss(transition)) {
		mPendingDismiss.onConsumed(aborted);
		mPendingDismiss.onConsumed(aborted, finishT);
		mPendingDismiss = null;
		ProtoLog.d(WM_SHELL_SPLIT_SCREEN, "onTransitionConsumed for dismiss transition");
		} else if (isPendingResize(transition)) {
		mPendingResize.onConsumed(aborted);
		mPendingResize.onConsumed(aborted, finishT);
		mPendingResize = null;
		ProtoLog.d(WM_SHELL_SPLIT_SCREEN, "onTransitionConsumed for resize transition");
		} else if (isPendingPassThrough(transition)) {
		mPendingRemotePassthrough.onConsumed(aborted);
		mPendingRemotePassthrough.onConsumed(aborted, finishT);
		mPendingRemotePassthrough.mRemoteHandler.onTransitionConsumed(transition, aborted,
		finishT);
		mPendingRemotePassthrough = null;
		@@ -602,7 +595,7 @@ class SplitScreenTransitions {

		/** Calls when the transition got consumed. */
		interface TransitionConsumedCallback {
		void onConsumed(boolean aborted);
		void onConsumed(boolean aborted, SurfaceControl.Transaction t);
		}

		/** Calls when the transition finished. */
		@@ -668,9 +661,9 @@ class SplitScreenTransitions {
		setFinishedCallback(finishedCb);
		}

		void onConsumed(boolean aborted) {
		void onConsumed(boolean aborted, SurfaceControl.Transaction finishT) {
		if (mConsumedCallback != null) {
		mConsumedCallback.onConsumed(aborted);
		mConsumedCallback.onConsumed(aborted, finishT);
		}
		}

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

+15 −7

Original line number	Diff line number	Diff line
		@@ -2906,25 +2906,33 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		mTransactionPool.release(t);
		return;
		}
		List<SplitDecorManager> decorManagers = new ArrayList<>();
		SplitDecorManager mainDecor = null;
		SplitDecorManager sideDecor = null;
		final List<SplitDecorManager> decorManagers;
		if (enableFlexibleSplit()) {
		decorManagers = mStageOrderOperator.getActiveStages().stream()
		.map(StageTaskListener::getSplitDecorManager)
		.toList();
		} else {
		mainDecor = mMainStage.getSplitDecorManager();
		sideDecor = mSideStage.getSplitDecorManager();
		decorManagers = new ArrayList<>();
		final SplitDecorManager mainDecor = mMainStage.getSplitDecorManager();
		final SplitDecorManager sideDecor = mSideStage.getSplitDecorManager();
		if (mainDecor != null) {
		decorManagers.add(mainDecor);
		}
		if (sideDecor != null) {
		decorManagers.add(sideDecor);
		}
		}
		sendOnBoundsChanged();
		mSplitLayout.setDividerInteractive(false, false, "onSplitResizeStart");
		mSplitTransitions.startResizeTransition(wct, this, (aborted) -> {
		mSplitTransitions.startResizeTransition(wct, this, (aborted, finishT) -> {
		mSplitLayout.setDividerInteractive(true, false, "onSplitResizeConsumed");
		for (SplitDecorManager decor : decorManagers) {
		decor.releaseDecor(finishT);
		}
		}, (finishWct, t) -> {
		mSplitLayout.setDividerInteractive(true, false, "onSplitResizeFinish");
		mSplitLayout.populateTouchZones();
		}, mainDecor, sideDecor, decorManagers);
		}, decorManagers);

		if (enableFlexibleTwoAppSplit()) {
		switch (layout.calculateCurrentSnapPosition()) {