Merge "[3/N] WindowDecorViewHost: Migrate WindowDecoration's SCVH" into main (abe51c2f) · Commits · e / os / android_frameworks_base

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

+8 −4

Original line number	Diff line number	Diff line
		@@ -152,6 +152,7 @@ import com.android.wm.shell.windowdecor.DesktopModeWindowDecorViewModel;
		import com.android.wm.shell.windowdecor.WindowDecorViewModel;
		import com.android.wm.shell.windowdecor.additionalviewcontainer.AdditionalSystemViewContainer;
		import com.android.wm.shell.windowdecor.common.viewhost.DefaultWindowDecorViewHostSupplier;
		import com.android.wm.shell.windowdecor.common.viewhost.WindowDecorViewHost;
		import com.android.wm.shell.windowdecor.common.viewhost.WindowDecorViewHostSupplier;
		import com.android.wm.shell.windowdecor.education.DesktopWindowingEducationPromoController;
		import com.android.wm.shell.windowdecor.education.DesktopWindowingEducationTooltipController;
		@@ -301,6 +302,7 @@ public abstract class WMShellModule {
		Transitions transitions,
		RootTaskDisplayAreaOrganizer rootTaskDisplayAreaOrganizer,
		FocusTransitionObserver focusTransitionObserver,
		WindowDecorViewHostSupplier<WindowDecorViewHost> windowDecorViewHostSupplier,
		Optional<DesktopModeWindowDecorViewModel> desktopModeWindowDecorViewModel) {
		if (desktopModeWindowDecorViewModel.isPresent()) {
		return desktopModeWindowDecorViewModel.get();
		@@ -318,7 +320,8 @@ public abstract class WMShellModule {
		rootTaskDisplayAreaOrganizer,
		syncQueue,
		transitions,
		focusTransitionObserver);
		focusTransitionObserver,
		windowDecorViewHostSupplier);
		}

		@WMSingleton
		@@ -343,7 +346,7 @@ public abstract class WMShellModule {

		@WMSingleton
		@Provides
		static WindowDecorViewHostSupplier provideWindowDecorViewHostSupplier(
		static WindowDecorViewHostSupplier<WindowDecorViewHost> provideWindowDecorViewHostSupplier(
		@ShellMainThread @NonNull CoroutineScope mainScope) {
		return new DefaultWindowDecorViewHostSupplier(mainScope);
		}
		@@ -908,6 +911,7 @@ public abstract class WMShellModule {
		InteractionJankMonitor interactionJankMonitor,
		AppToWebGenericLinksParser genericLinksParser,
		AssistContentRequester assistContentRequester,
		WindowDecorViewHostSupplier<WindowDecorViewHost> windowDecorViewHostSupplier,
		MultiInstanceHelper multiInstanceHelper,
		Optional<DesktopTasksLimiter> desktopTasksLimiter,
		AppHandleEducationController appHandleEducationController,
		@@ -927,8 +931,8 @@ public abstract class WMShellModule {
		displayInsetsController, syncQueue, transitions, desktopTasksController,
		desktopImmersiveController.get(),
		rootTaskDisplayAreaOrganizer, interactionJankMonitor, genericLinksParser,
		assistContentRequester, multiInstanceHelper, desktopTasksLimiter,
		appHandleEducationController, appToWebEducationController,
		assistContentRequester, windowDecorViewHostSupplier, multiInstanceHelper,
		desktopTasksLimiter, appHandleEducationController, appToWebEducationController,
		windowDecorCaptionHandleRepository, activityOrientationChangeHandler,
		focusTransitionObserver, desktopModeEventLogger, desktopModeUiEventLogger));
		}

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecorViewModel.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -68,6 +68,8 @@ import com.android.wm.shell.splitscreen.SplitScreenController;
		import com.android.wm.shell.sysui.ShellInit;
		import com.android.wm.shell.transition.FocusTransitionObserver;
		import com.android.wm.shell.transition.Transitions;
		import com.android.wm.shell.windowdecor.common.viewhost.WindowDecorViewHost;
		import com.android.wm.shell.windowdecor.common.viewhost.WindowDecorViewHostSupplier;
		import com.android.wm.shell.windowdecor.extension.TaskInfoKt;

		/**
		@@ -90,6 +92,7 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel, FocusT
		private final Transitions mTransitions;
		private final Region mExclusionRegion = Region.obtain();
		private final InputManager mInputManager;
		private final WindowDecorViewHostSupplier<WindowDecorViewHost> mWindowDecorViewHostSupplier;
		private TaskOperations mTaskOperations;
		private FocusTransitionObserver mFocusTransitionObserver;

		@@ -130,7 +133,8 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel, FocusT
		RootTaskDisplayAreaOrganizer rootTaskDisplayAreaOrganizer,
		SyncTransactionQueue syncQueue,
		Transitions transitions,
		FocusTransitionObserver focusTransitionObserver) {
		FocusTransitionObserver focusTransitionObserver,
		WindowDecorViewHostSupplier<WindowDecorViewHost> windowDecorViewHostSupplier) {
		mContext = context;
		mMainExecutor = shellExecutor;
		mMainHandler = mainHandler;
		@@ -143,6 +147,7 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel, FocusT
		mSyncQueue = syncQueue;
		mTransitions = transitions;
		mFocusTransitionObserver = focusTransitionObserver;
		mWindowDecorViewHostSupplier = windowDecorViewHostSupplier;
		if (!Transitions.ENABLE_SHELL_TRANSITIONS) {
		mTaskOperations = new TaskOperations(null, mContext, mSyncQueue);
		}
		@@ -332,7 +337,8 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel, FocusT
		mMainHandler,
		mBgExecutor,
		mMainChoreographer,
		mSyncQueue);
		mSyncQueue,
		mWindowDecorViewHostSupplier);
		mWindowDecorByTaskId.put(taskInfo.taskId, windowDecoration);

		final FluidResizeTaskPositioner taskPositioner =

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/CaptionWindowDecoration.java

+6 −3

Original line number	Diff line number	Diff line
		@@ -58,6 +58,8 @@ import com.android.wm.shell.common.DisplayLayout;
		import com.android.wm.shell.common.ShellExecutor;
		import com.android.wm.shell.common.SyncTransactionQueue;
		import com.android.wm.shell.shared.annotations.ShellBackgroundThread;
		import com.android.wm.shell.windowdecor.common.viewhost.WindowDecorViewHost;
		import com.android.wm.shell.windowdecor.common.viewhost.WindowDecorViewHostSupplier;
		import com.android.wm.shell.windowdecor.extension.TaskInfoKt;

		/**
		@@ -90,9 +92,10 @@ public class CaptionWindowDecoration extends WindowDecoration<WindowDecorLinearL
		Handler handler,
		@ShellBackgroundThread ShellExecutor bgExecutor,
		Choreographer choreographer,
		SyncTransactionQueue syncQueue) {
		super(context, userContext, displayController, taskOrganizer, handler, taskInfo,
		taskSurface);
		SyncTransactionQueue syncQueue,
		@NonNull WindowDecorViewHostSupplier<WindowDecorViewHost> windowDecorViewHostSupplier) {
		super(context, userContext, displayController, taskOrganizer, taskInfo,
		taskSurface, windowDecorViewHostSupplier);
		mHandler = handler;
		mBgExecutor = bgExecutor;
		mChoreographer = choreographer;

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -139,6 +139,8 @@ import com.android.wm.shell.sysui.ShellInit;
		import com.android.wm.shell.transition.FocusTransitionObserver;
		import com.android.wm.shell.transition.Transitions;
		import com.android.wm.shell.windowdecor.DesktopModeWindowDecoration.ExclusionRegionListener;
		import com.android.wm.shell.windowdecor.common.viewhost.WindowDecorViewHost;
		import com.android.wm.shell.windowdecor.common.viewhost.WindowDecorViewHostSupplier;
		import com.android.wm.shell.windowdecor.extension.InsetsStateKt;
		import com.android.wm.shell.windowdecor.extension.TaskInfoKt;
		import com.android.wm.shell.windowdecor.viewholder.AppHeaderViewHolder;
		@@ -217,6 +219,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel,
		private boolean mInImmersiveMode;
		private final String mSysUIPackageName;
		private final AssistContentRequester mAssistContentRequester;
		private final WindowDecorViewHostSupplier<WindowDecorViewHost> mWindowDecorViewHostSupplier;

		private final DisplayChangeController.OnDisplayChangingListener mOnDisplayChangingListener;
		private final ISystemGestureExclusionListener mGestureExclusionListener =
		@@ -260,6 +263,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel,
		InteractionJankMonitor interactionJankMonitor,
		AppToWebGenericLinksParser genericLinksParser,
		AssistContentRequester assistContentRequester,
		@NonNull WindowDecorViewHostSupplier<WindowDecorViewHost> windowDecorViewHostSupplier,
		MultiInstanceHelper multiInstanceHelper,
		Optional<DesktopTasksLimiter> desktopTasksLimiter,
		AppHandleEducationController appHandleEducationController,
		@@ -289,6 +293,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel,
		desktopImmersiveController,
		genericLinksParser,
		assistContentRequester,
		windowDecorViewHostSupplier,
		multiInstanceHelper,
		new DesktopModeWindowDecoration.Factory(),
		new InputMonitorFactory(),
		@@ -329,6 +334,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel,
		DesktopImmersiveController desktopImmersiveController,
		AppToWebGenericLinksParser genericLinksParser,
		AssistContentRequester assistContentRequester,
		@NonNull WindowDecorViewHostSupplier<WindowDecorViewHost> windowDecorViewHostSupplier,
		MultiInstanceHelper multiInstanceHelper,
		DesktopModeWindowDecoration.Factory desktopModeWindowDecorFactory,
		InputMonitorFactory inputMonitorFactory,
		@@ -381,6 +387,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel,
		mWindowDecorCaptionHandleRepository = windowDecorCaptionHandleRepository;
		mActivityOrientationChangeHandler = activityOrientationChangeHandler;
		mAssistContentRequester = assistContentRequester;
		mWindowDecorViewHostSupplier = windowDecorViewHostSupplier;
		mOnDisplayChangingListener = (displayId, fromRotation, toRotation, displayAreaInfo, t) -> {
		DesktopModeWindowDecoration decoration;
		RunningTaskInfo taskInfo;
		@@ -1623,6 +1630,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel,
		mRootTaskDisplayAreaOrganizer,
		mGenericLinksParser,
		mAssistContentRequester,
		mWindowDecorViewHostSupplier,
		mMultiInstanceHelper,
		mWindowDecorCaptionHandleRepository,
		mDesktopModeEventLogger);

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java

+10 −2

Original line number	Diff line number	Diff line
		@@ -105,6 +105,8 @@ import com.android.wm.shell.shared.desktopmode.DesktopModeStatus;
		import com.android.wm.shell.shared.desktopmode.DesktopModeTransitionSource;
		import com.android.wm.shell.shared.multiinstance.ManageWindowsViewContainer;
		import com.android.wm.shell.splitscreen.SplitScreenController;
		import com.android.wm.shell.windowdecor.common.viewhost.WindowDecorViewHost;
		import com.android.wm.shell.windowdecor.common.viewhost.WindowDecorViewHostSupplier;
		import com.android.wm.shell.windowdecor.extension.TaskInfoKt;
		import com.android.wm.shell.windowdecor.viewholder.AppHandleViewHolder;
		import com.android.wm.shell.windowdecor.viewholder.AppHeaderViewHolder;
		@@ -219,6 +221,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin
		RootTaskDisplayAreaOrganizer rootTaskDisplayAreaOrganizer,
		AppToWebGenericLinksParser genericLinksParser,
		AssistContentRequester assistContentRequester,
		@NonNull WindowDecorViewHostSupplier<WindowDecorViewHost> windowDecorViewHostSupplier,
		MultiInstanceHelper multiInstanceHelper,
		WindowDecorCaptionHandleRepository windowDecorCaptionHandleRepository,
		DesktopModeEventLogger desktopModeEventLogger) {
		@@ -230,6 +233,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin
		WindowContainerTransaction::new, SurfaceControl::new, new WindowManagerWrapper(
		context.getSystemService(WindowManager.class)),
		new SurfaceControlViewHostFactory() {},
		windowDecorViewHostSupplier,
		DefaultMaximizeMenuFactory.INSTANCE,
		DefaultHandleMenuFactory.INSTANCE, multiInstanceHelper,
		windowDecorCaptionHandleRepository, desktopModeEventLogger);
		@@ -258,15 +262,16 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin
		Supplier<SurfaceControl> surfaceControlSupplier,
		WindowManagerWrapper windowManagerWrapper,
		SurfaceControlViewHostFactory surfaceControlViewHostFactory,
		@NonNull WindowDecorViewHostSupplier<WindowDecorViewHost> windowDecorViewHostSupplier,
		MaximizeMenuFactory maximizeMenuFactory,
		HandleMenuFactory handleMenuFactory,
		MultiInstanceHelper multiInstanceHelper,
		WindowDecorCaptionHandleRepository windowDecorCaptionHandleRepository,
		DesktopModeEventLogger desktopModeEventLogger) {
		super(context, userContext, displayController, taskOrganizer, handler, taskInfo,
		super(context, userContext, displayController, taskOrganizer, taskInfo,
		taskSurface, surfaceControlBuilderSupplier, surfaceControlTransactionSupplier,
		windowContainerTransactionSupplier, surfaceControlSupplier,
		surfaceControlViewHostFactory, desktopModeEventLogger);
		surfaceControlViewHostFactory, windowDecorViewHostSupplier, desktopModeEventLogger);
		mSplitScreenController = splitScreenController;
		mHandler = handler;
		mBgExecutor = bgExecutor;
		@@ -1760,6 +1765,8 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin
		RootTaskDisplayAreaOrganizer rootTaskDisplayAreaOrganizer,
		AppToWebGenericLinksParser genericLinksParser,
		AssistContentRequester assistContentRequester,
		@NonNull WindowDecorViewHostSupplier<WindowDecorViewHost>
		windowDecorViewHostSupplier,
		MultiInstanceHelper multiInstanceHelper,
		WindowDecorCaptionHandleRepository windowDecorCaptionHandleRepository,
		DesktopModeEventLogger desktopModeEventLogger) {
		@@ -1780,6 +1787,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin
		rootTaskDisplayAreaOrganizer,
		genericLinksParser,
		assistContentRequester,
		windowDecorViewHostSupplier,
		multiInstanceHelper,
		windowDecorCaptionHandleRepository,
		desktopModeEventLogger);