From 1b8e88840a3ab7f40c91986a40d61ae692af55cb Mon Sep 17 00:00:00 2001 From: Jerry Chang Date: Tue, 23 Nov 2021 17:50:36 +0000 Subject: [PATCH] Revert "Support to transfer freeform task into split screen" This reverts commit bd8b345337012e7d40ab1ff4043bab6eea6c72bf. Reason for revert: b/207034379 Change-Id: I48d9b5289dd52d72f925cb155f38c5a1ed493d49 --- .../android/wm/shell/freeform/FreeformTaskListener.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskListener.java b/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskListener.java index 8a8d7c68d9f64..5fb3297aa6d30 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskListener.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskListener.java @@ -16,7 +16,6 @@ package com.android.wm.shell.freeform; -import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; import static android.content.pm.PackageManager.FEATURE_FREEFORM_WINDOW_MANAGEMENT; import static android.provider.Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT; @@ -28,7 +27,6 @@ import android.provider.Settings; import android.util.Slog; import android.util.SparseArray; import android.view.SurfaceControl; -import android.window.WindowContainerTransaction; import com.android.internal.protolog.common.ProtoLog; import com.android.wm.shell.ShellTaskOrganizer; @@ -85,13 +83,6 @@ public class FreeformTaskListener implements ShellTaskOrganizer.TaskListener { Slog.e(TAG, "Task already vanished: #" + taskInfo.taskId); return; } - - // Clears windowing mode and window bounds to let the task inherits from its new parent. - final WindowContainerTransaction wct = new WindowContainerTransaction(); - wct.setBounds(taskInfo.token, null) - .setWindowingMode(taskInfo.token, WINDOWING_MODE_UNDEFINED); - mSyncQueue.queue(wct); - ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TASK_ORG, "Freeform Task Vanished: #%d", taskInfo.taskId); mTasks.remove(taskInfo.taskId);