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

Commit 32b6b21f authored by Merissa Mitchell's avatar Merissa Mitchell Committed by Android (Google) Code Review
Browse files

Merge "[PiP on Desktop] Apply wct in Transition in close()." into main

parents 0d3dda8e 420eca37

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

+1 −0
Original line number Diff line number Diff line
@@ -343,6 +343,7 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel, FocusT 
                        taskInfo,

                        taskSurface,

                        mMainHandler,

                        mTransitions,

                        mMainExecutor,

                        mBgExecutor,

                        mMainChoreographer,

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

+4 −2
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ import com.android.wm.shell.common.SyncTransactionQueue; 
import com.android.wm.shell.shared.annotations.ShellBackgroundThread;

import com.android.wm.shell.shared.annotations.ShellMainThread;

import com.android.wm.shell.shared.desktopmode.DesktopConfig;

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;
@@ -100,14 +101,15 @@ public class CaptionWindowDecoration extends WindowDecoration<WindowDecorLinearL 
            RunningTaskInfo taskInfo,

            SurfaceControl taskSurface,

            Handler handler,

            @NonNull Transitions transitions,

            @ShellMainThread ShellExecutor mainExecutor,

            @ShellBackgroundThread ShellExecutor bgExecutor,

            Choreographer choreographer,

            SyncTransactionQueue syncQueue,

            @NonNull WindowDecorViewHostSupplier<WindowDecorViewHost> windowDecorViewHostSupplier,

            DesktopConfig desktopConfig) {

        super(context, userContext, displayController, taskOrganizer, taskInfo,

                taskSurface, windowDecorViewHostSupplier);

        super(context, handler, transitions, userContext, displayController, taskOrganizer,

                taskInfo, taskSurface, windowDecorViewHostSupplier);

        mHandler = handler;

        mMainExecutor = mainExecutor;

        mBgExecutor = bgExecutor;

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

+11 −0
Original line number Diff line number Diff line
@@ -15,11 +15,13 @@ 
 */

package com.android.wm.shell.windowdecor;



import android.annotation.NonNull;

import android.app.ActivityManager.RunningTaskInfo;

import android.app.ActivityTaskManager;

import android.app.IActivityTaskManager;

import android.content.Context;

import android.hardware.input.InputManager;

import android.os.Handler;

import android.os.RemoteException;

import android.os.SystemClock;

import android.os.UserHandle;
@@ -47,6 +49,7 @@ import com.android.wm.shell.shared.annotations.ShellMainThread; 
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;
@@ -60,6 +63,8 @@ public abstract class CarWindowDecorViewModel 


    private final ShellTaskOrganizer mTaskOrganizer;

    private final Context mContext;

    private final @NonNull @ShellMainThread Handler mHandler;

    private final @NonNull Transitions mTransitions;

    private final @ShellBackgroundThread ShellExecutor mBgExecutor;

    private final ShellExecutor mMainExecutor;

    private final DisplayController mDisplayController;
@@ -72,6 +77,8 @@ public abstract class CarWindowDecorViewModel 


    public CarWindowDecorViewModel(

            Context context,

            @NonNull @ShellMainThread Handler handler,

            @NonNull Transitions transitions,

            @ShellMainThread ShellExecutor mainExecutor,

            @ShellBackgroundThread ShellExecutor bgExecutor,

            ShellInit shellInit,
@@ -82,6 +89,8 @@ public abstract class CarWindowDecorViewModel 
            FocusTransitionObserver focusTransitionObserver,

            WindowDecorViewHostSupplier<WindowDecorViewHost> windowDecorViewHostSupplier) {

        mContext = context;

        mHandler = handler;

        mTransitions = transitions;

        mMainExecutor = mainExecutor;

        mBgExecutor = bgExecutor;

        mTaskOrganizer = taskOrganizer;
@@ -238,6 +247,8 @@ public abstract class CarWindowDecorViewModel 
        final CarWindowDecoration windowDecoration =

                new CarWindowDecoration(

                        mContext,

                        mHandler,

                        mTransitions,

                        mContext.createContextAsUser(UserHandle.of(taskInfo.userId), 0 /* flags */),

                        mDisplayController,

                        mTaskOrganizer,

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

+7 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.Context; 
import android.graphics.Insets;

import android.graphics.Rect;

import android.graphics.Region;

import android.os.Handler;

import android.view.InsetsState;

import android.view.SurfaceControl;

import android.view.View;
@@ -37,6 +38,8 @@ import com.android.wm.shell.ShellTaskOrganizer; 
import com.android.wm.shell.common.DisplayController;

import com.android.wm.shell.common.ShellExecutor;

import com.android.wm.shell.shared.annotations.ShellBackgroundThread;

import com.android.wm.shell.shared.annotations.ShellMainThread;

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;
@@ -52,6 +55,8 @@ public class CarWindowDecoration extends WindowDecoration<WindowDecorLinearLayou 


    CarWindowDecoration(

            Context context,

            @android.annotation.NonNull @ShellMainThread Handler handler,

            @android.annotation.NonNull Transitions transitions,

            @android.annotation.NonNull Context userContext,

            DisplayController displayController,

            ShellTaskOrganizer taskOrganizer,
@@ -60,8 +65,8 @@ public class CarWindowDecoration extends WindowDecoration<WindowDecorLinearLayou 
            @ShellBackgroundThread ShellExecutor bgExecutor,

            WindowDecorViewHostSupplier<WindowDecorViewHost> windowDecorViewHostSupplier,

            View.OnClickListener clickListener) {

        super(context, userContext, displayController, taskOrganizer, taskInfo, taskSurface,

                windowDecorViewHostSupplier);

        super(context, handler, transitions, userContext, displayController, taskOrganizer,

                taskInfo, taskSurface, windowDecorViewHostSupplier);

        mBgExecutor = bgExecutor;

        mClickListener = clickListener;

    }

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

+5 −4
Original line number Diff line number Diff line
@@ -311,10 +311,11 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
            DesktopState desktopState,

            DesktopConfig desktopConfig,

            WindowDecorationActions windowDecorationActions) {

        super(context, userContext, displayController, taskOrganizer, taskInfo,

                taskSurface, surfaceControlBuilderSupplier, surfaceControlTransactionSupplier,

                windowContainerTransactionSupplier, surfaceControlSupplier,

                surfaceControlViewHostFactory, windowDecorViewHostSupplier, desktopModeEventLogger);

        super(context, handler, transitions, userContext, displayController, taskOrganizer,

                taskInfo, taskSurface, surfaceControlBuilderSupplier,

                surfaceControlTransactionSupplier, windowContainerTransactionSupplier,

                surfaceControlSupplier, surfaceControlViewHostFactory, windowDecorViewHostSupplier,

                desktopModeEventLogger);

        mSplitScreenController = splitScreenController;

        mHandler = handler;

        mMainExecutor = mainExecutor;