Merge "Remove RelayoutBlock from WindowDecoration" into main (477a62f6) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -210,7 +210,6 @@ public abstract class WMShellModule {
		SyncTransactionQueue syncQueue,
		Transitions transitions,
		Optional<DesktopTasksController> desktopTasksController,
		RecentsTransitionHandler recentsTransitionHandler,
		RootTaskDisplayAreaOrganizer rootTaskDisplayAreaOrganizer) {
		if (DesktopModeStatus.isEnabled()) {
		return new DesktopModeWindowDecorViewModel(
		@@ -226,7 +225,6 @@ public abstract class WMShellModule {
		syncQueue,
		transitions,
		desktopTasksController,
		recentsTransitionHandler,
		rootTaskDisplayAreaOrganizer);
		}
		return new CaptionWindowDecorViewModel(

+2 −6

Original line number	Diff line number	Diff line
		@@ -320,9 +320,8 @@ class DesktopTasksController(
		}

		/** Move a task with given `taskId` to fullscreen */
		fun moveToFullscreen(taskId: Int, windowDecor: DesktopModeWindowDecoration) {
		fun moveToFullscreen(taskId: Int) {
		shellTaskOrganizer.getRunningTaskInfo(taskId)?.let { task ->
		windowDecor.incrementRelayoutBlock()
		moveToFullscreenWithAnimation(task, task.positionInParent)
		}
		}
		@@ -906,20 +905,17 @@ class DesktopTasksController(
		* @param position position of surface when drag ends.
		* @param inputCoordinate the coordinates of the motion event
		* @param taskBounds the updated bounds of the task being dragged.
		* @param windowDecor the window decoration for the task being dragged
		*/
		fun onDragPositioningEnd(
		taskInfo: RunningTaskInfo,
		position: Point,
		inputCoordinate: PointF,
		taskBounds: Rect,
		windowDecor: DesktopModeWindowDecoration
		taskBounds: Rect
		) {
		if (taskInfo.configuration.windowConfiguration.windowingMode != WINDOWING_MODE_FREEFORM) {
		return
		}
		if (taskBounds.top <= transitionAreaHeight) {
		windowDecor.incrementRelayoutBlock()
		moveToFullscreenWithAnimation(taskInfo, position)
		}
		if (inputCoordinate.x <= transitionAreaWidth) {

+0 −2

Original line number	Diff line number	Diff line
		@@ -54,8 +54,6 @@ class ToggleResizeDesktopTaskTransitionHandler(
		taskId: Int,
		windowDecoration: DesktopModeWindowDecoration
		) {
		// Pause relayout until the transition animation finishes.
		windowDecoration.incrementRelayoutBlock()
		transitions.startTransition(TRANSIT_DESKTOP_MODE_TOGGLE_RESIZE, wct, this)
		taskToDecorationMap.put(taskId, windowDecoration)
		}

+0 −4

Original line number	Diff line number	Diff line
		@@ -112,7 +112,6 @@ public class FreeformTaskTransitionObserver implements Transitions.TransitionObs
		onChangeTransitionReady(change, startT, finishT);
		break;
		}
		mWindowDecorViewModel.onTransitionReady(transition, info, change);
		}
		mTransitionToTaskInfo.put(transition, taskInfoList);
		}
		@@ -153,8 +152,6 @@ public class FreeformTaskTransitionObserver implements Transitions.TransitionObs

		@Override
		public void onTransitionMerged(@NonNull IBinder merged, @NonNull IBinder playing) {
		mWindowDecorViewModel.onTransitionMerged(merged, playing);

		final List<ActivityManager.RunningTaskInfo> infoOfMerged =
		mTransitionToTaskInfo.get(merged);
		if (infoOfMerged == null) {
		@@ -178,7 +175,6 @@ public class FreeformTaskTransitionObserver implements Transitions.TransitionObs
		final List<ActivityManager.RunningTaskInfo> taskInfo =
		mTransitionToTaskInfo.getOrDefault(transition, Collections.emptyList());
		mTransitionToTaskInfo.remove(transition);
		mWindowDecorViewModel.onTransitionFinished(transition);
		for (int i = 0; i < taskInfo.size(); ++i) {
		mWindowDecorViewModel.destroyWindowDecoration(taskInfo.get(i));
		}

+0 −12

Original line number	Diff line number	Diff line
		@@ -23,13 +23,11 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
		import android.app.ActivityManager.RunningTaskInfo;
		import android.content.Context;
		import android.os.Handler;
		import android.os.IBinder;
		import android.util.SparseArray;
		import android.view.Choreographer;
		import android.view.MotionEvent;
		import android.view.SurfaceControl;
		import android.view.View;
		import android.window.TransitionInfo;
		import android.window.WindowContainerToken;
		import android.window.WindowContainerTransaction;

		@@ -79,16 +77,6 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel {
		}
		}

		@Override
		public void onTransitionReady(IBinder transition, TransitionInfo info,
		TransitionInfo.Change change) {}

		@Override
		public void onTransitionMerged(IBinder merged, IBinder playing) {}

		@Override
		public void onTransitionFinished(IBinder transition) {}

		@Override
		public void setFreeformTaskTransitionStarter(FreeformTaskTransitionStarter transitionStarter) {
		mTaskOperations = new TaskOperations(transitionStarter, mContext, mSyncQueue);