Merge "Fix App Handle visibility and input heuristics" into main (cb325845) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt

+8 −5

Original line number	Diff line number	Diff line
		@@ -2793,11 +2793,14 @@ class DesktopTasksController(
		taskInfo: RunningTaskInfo,
		deskId: Int?,
		): RunOnTransitStart? {
		if (!DesktopModeFlags.ENABLE_INPUT_LAYER_TRANSITION_FIX.isTrue) {
		// This windowing mode is to get the transition animation started; once we complete
		// split select, we will change windowing mode to undefined and inherit from split stage.
		// split select, we will change windowing mode to undefined and inherit from split
		// stage.
		// Going to undefined here causes task to flicker to the top left.
		// Cancelling the split select flow will revert it to fullscreen.
		wct.setWindowingMode(taskInfo.token, WINDOWING_MODE_MULTI_WINDOW)
		}
		// The task's density may have been overridden in freeform; revert it here as we don't
		// want it overridden in multi-window.
		wct.setDensityDpi(taskInfo.token, getDefaultDensityDpi())

+3 −3

Original line number	Diff line number	Diff line
		@@ -174,7 +174,7 @@ public class FreeformTaskTransitionObserver implements Transitions.TransitionObs
		SurfaceControl.Transaction finishT) {
		mTaskChangeListener.ifPresent(listener -> listener.onTaskChanging(change.getTaskInfo()));
		mWindowDecorViewModel.onTaskChanging(
		change.getTaskInfo(), change.getLeash(), startT, finishT, change.getMode());
		change.getTaskInfo(), change.getLeash(), startT, finishT);
		}

		private void onToFrontTransitionReady(
		@@ -184,7 +184,7 @@ public class FreeformTaskTransitionObserver implements Transitions.TransitionObs
		mTaskChangeListener.ifPresent(
		listener -> listener.onTaskMovingToFront(change.getTaskInfo()));
		mWindowDecorViewModel.onTaskChanging(
		change.getTaskInfo(), change.getLeash(), startT, finishT, change.getMode());
		change.getTaskInfo(), change.getLeash(), startT, finishT);
		}

		private void onToBackTransitionReady(
		@@ -194,7 +194,7 @@ public class FreeformTaskTransitionObserver implements Transitions.TransitionObs
		mTaskChangeListener.ifPresent(
		listener -> listener.onTaskMovingToBack(change.getTaskInfo()));
		mWindowDecorViewModel.onTaskChanging(
		change.getTaskInfo(), change.getLeash(), startT, finishT, change.getMode());
		change.getTaskInfo(), change.getLeash(), startT, finishT);
		}

		@Override

+1 −3

Original line number	Diff line number	Diff line
		@@ -124,7 +124,6 @@ import android.view.SurfaceControl;
		import android.view.WindowManager;
		import android.widget.Toast;
		import android.window.DesktopExperienceFlags;
		import android.window.DesktopModeFlags;
		import android.window.DisplayAreaInfo;
		import android.window.RemoteTransition;
		import android.window.TransitionInfo;
		@@ -684,8 +683,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		if (!enteredSplitSelect) {
		return null;
		}
		if (!DesktopExperienceFlags.ENABLE_MULTIPLE_DESKTOPS_BACKEND.isTrue()
		&& !DesktopModeFlags.ENABLE_INPUT_LAYER_TRANSITION_FIX.isTrue()) {
		if (!DesktopExperienceFlags.ENABLE_MULTIPLE_DESKTOPS_BACKEND.isTrue()) {
		mTaskOrganizer.applyTransaction(wct);
		return null;
		}

+1 −3

Original line number	Diff line number	Diff line
		@@ -49,7 +49,6 @@ import android.view.SurfaceControl;
		import android.view.View;
		import android.view.ViewConfiguration;
		import android.window.DisplayAreaInfo;
		import android.window.TransitionInfo;
		import android.window.WindowContainerToken;
		import android.window.WindowContainerTransaction;

		@@ -234,8 +233,7 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel, FocusT
		RunningTaskInfo taskInfo,
		SurfaceControl taskSurface,
		SurfaceControl.Transaction startT,
		SurfaceControl.Transaction finishT,
		@TransitionInfo.TransitionMode int changeMode) {
		SurfaceControl.Transaction finishT) {
		final CaptionWindowDecoration decoration = mWindowDecorByTaskId.get(taskInfo.taskId);

		if (!shouldShowWindowDecor(taskInfo)) {

+1 −3

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ import android.view.KeyCharacterMap;
		import android.view.KeyEvent;
		import android.view.SurfaceControl;
		import android.view.View;
		import android.window.TransitionInfo;
		import android.window.WindowContainerToken;
		import android.window.WindowContainerTransaction;

		@@ -160,8 +159,7 @@ public abstract class CarWindowDecorViewModel
		RunningTaskInfo taskInfo,
		SurfaceControl taskSurface,
		SurfaceControl.Transaction startT,
		SurfaceControl.Transaction finishT,
		@TransitionInfo.TransitionMode int changeMode) {
		SurfaceControl.Transaction finishT) {
		final CarWindowDecoration decoration = mWindowDecorByTaskId.get(taskInfo.taskId);

		if (!shouldShowWindowDecor(taskInfo)) {