Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6b81033 authored by Jerry Chang's avatar Jerry Chang Committed by Automerger Merge Worker
Browse files

Merge "Revert "Support to transfer freeform task into split screen"" into... 

Merge "Revert "Support to transfer freeform task into split screen"" into sc-v2-dev am: 21f00a14 am: 3973ceea

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16331281

Change-Id: I2da62d3b9bd2cd0b9fe383cbe10f78f8fbfbeff9
parents ba393ca8 3973ceea

libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskListener.java

+0 −9
Original line number Diff line number Diff line
@@ -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);