Merge "Use decor's TaskInfo instead of ShellTaskOrganizer's" into main (7863fd9d) · Commits · e / os / android_frameworks_base

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

+9 −9

Original line number	Diff line number	Diff line
		@@ -345,7 +345,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel {
		mTaskOperations.injectBackKey();
		} else if (id == R.id.caption_handle \|\| id == R.id.open_menu_button) {
		if (!decoration.isHandleMenuActive()) {
		moveTaskToFront(mTaskOrganizer.getRunningTaskInfo(mTaskId));
		moveTaskToFront(decoration.mTaskInfo);
		decoration.createHandleMenu();
		} else {
		decoration.closeHandleMenu();
		@@ -419,10 +419,10 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel {
		&& id != R.id.maximize_window) {
		return false;
		}
		moveTaskToFront(mTaskOrganizer.getRunningTaskInfo(mTaskId));
		final DesktopModeWindowDecoration decoration = mWindowDecorByTaskId.get(mTaskId);
		moveTaskToFront(decoration.mTaskInfo);

		if (!mHasLongClicked && id != R.id.maximize_window) {
		final DesktopModeWindowDecoration decoration = mWindowDecorByTaskId.get(mTaskId);
		decoration.closeMaximizeMenuIfNeeded(e);
		}

		@@ -466,7 +466,8 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel {
		*/
		@Override
		public boolean handleMotionEvent(@Nullable View v, MotionEvent e) {
		final RunningTaskInfo taskInfo = mTaskOrganizer.getRunningTaskInfo(mTaskId);
		final DesktopModeWindowDecoration decoration = mWindowDecorByTaskId.get(mTaskId);
		final RunningTaskInfo taskInfo = decoration.mTaskInfo;
		if (DesktopModeStatus.isEnabled()
		&& taskInfo.getWindowingMode() == WINDOWING_MODE_FULLSCREEN) {
		return false;
		@@ -492,8 +493,6 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel {
		}
		case MotionEvent.ACTION_MOVE: {
		mShouldClick = false;
		final DesktopModeWindowDecoration decoration =
		mWindowDecorByTaskId.get(mTaskId);
		// If a decor's resize drag zone is active, don't also try to reposition it.
		if (decoration.isHandlingDragResize()) break;
		decoration.closeMaximizeMenu();
		@@ -557,9 +556,10 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel {
		&& action != MotionEvent.ACTION_CANCEL)) {
		return false;
		}
		final RunningTaskInfo taskInfo = mTaskOrganizer.getRunningTaskInfo(mTaskId);
		mDesktopTasksController.ifPresent(c -> c.toggleDesktopTaskSize(taskInfo,
		mWindowDecorByTaskId.get(taskInfo.taskId)));
		mDesktopTasksController.ifPresent(c -> {
		final DesktopModeWindowDecoration decoration = mWindowDecorByTaskId.get(mTaskId);
		c.toggleDesktopTaskSize(decoration.mTaskInfo, decoration);
		});
		return true;
		}
		}