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

Commit 41467060 authored by Jorge Gil's avatar Jorge Gil Committed by Android (Google) Code Review
Browse files

Merge "Revert "Add WindowDecorViewHost and WindowDecorViewHostSupplier"" into main

parents b165594d 49697fa9

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java

+3 −16
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.wm.shell.dagger; 


import static android.window.flags.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TASK_LIMIT;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.KeyguardManager;

import android.content.Context;
@@ -117,8 +116,6 @@ import com.android.wm.shell.unfold.qualifier.UnfoldTransition; 
import com.android.wm.shell.windowdecor.CaptionWindowDecorViewModel;

import com.android.wm.shell.windowdecor.DesktopModeWindowDecorViewModel;

import com.android.wm.shell.windowdecor.WindowDecorViewModel;

import com.android.wm.shell.windowdecor.viewhost.DefaultWindowDecorViewHostSupplier;

import com.android.wm.shell.windowdecor.viewhost.WindowDecorViewHostSupplier;



import dagger.Binds;

import dagger.Lazy;
@@ -250,8 +247,7 @@ public abstract class WMShellModule { 
            MultiInstanceHelper multiInstanceHelper,

            Optional<DesktopTasksLimiter> desktopTasksLimiter,

            WindowDecorCaptionHandleRepository windowDecorCaptionHandleRepository,

            Optional<DesktopActivityOrientationChangeHandler> desktopActivityOrientationHandler,

            WindowDecorViewHostSupplier windowDecorViewHostSupplier) {

            Optional<DesktopActivityOrientationChangeHandler> desktopActivityOrientationHandler) {

        if (DesktopModeStatus.canEnterDesktopMode(context)) {

            return new DesktopModeWindowDecorViewModel(

                    context,
@@ -276,8 +272,7 @@ public abstract class WMShellModule { 
                    multiInstanceHelper,

                    desktopTasksLimiter,

                    windowDecorCaptionHandleRepository,

                    desktopActivityOrientationHandler,

                    windowDecorViewHostSupplier);

                    desktopActivityOrientationHandler);

        }

        return new CaptionWindowDecorViewModel(

                context,
@@ -291,8 +286,7 @@ public abstract class WMShellModule { 
                displayController,

                rootTaskDisplayAreaOrganizer,

                syncQueue,

                transitions,

                windowDecorViewHostSupplier);

                transitions);

    }



    @WMSingleton
@@ -383,13 +377,6 @@ public abstract class WMShellModule { 
                context, shellInit, transitions, windowDecorViewModel);

    }



    @WMSingleton

    @Provides

    static WindowDecorViewHostSupplier provideWindowDecorViewHostSupplier(

            @ShellMainThread @NonNull CoroutineScope mainScope) {

        return new DefaultWindowDecorViewHostSupplier(mainScope);

    }



    //

    // One handed mode

    //

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

+2 −7
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ import com.android.wm.shell.splitscreen.SplitScreenController; 
import com.android.wm.shell.sysui.ShellInit;

import com.android.wm.shell.transition.Transitions;

import com.android.wm.shell.windowdecor.extension.TaskInfoKt;

import com.android.wm.shell.windowdecor.viewhost.WindowDecorViewHostSupplier;



/**

 * View model for the window decoration with a caption and shadows. Works with
@@ -85,7 +84,6 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel { 
    private final Transitions mTransitions;

    private final Region mExclusionRegion = Region.obtain();

    private final InputManager mInputManager;

    private final WindowDecorViewHostSupplier mWindowDecorViewHostSupplier;

    private TaskOperations mTaskOperations;



    /**
@@ -123,8 +121,7 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel { 
            DisplayController displayController,

            RootTaskDisplayAreaOrganizer rootTaskDisplayAreaOrganizer,

            SyncTransactionQueue syncQueue,

            Transitions transitions,

            WindowDecorViewHostSupplier windowDecorViewHostSupplier) {

            Transitions transitions) {

        mContext = context;

        mMainExecutor = shellExecutor;

        mMainHandler = mainHandler;
@@ -136,7 +133,6 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel { 
        mRootTaskDisplayAreaOrganizer = rootTaskDisplayAreaOrganizer;

        mSyncQueue = syncQueue;

        mTransitions = transitions;

        mWindowDecorViewHostSupplier = windowDecorViewHostSupplier;

        if (!Transitions.ENABLE_SHELL_TRANSITIONS) {

            mTaskOperations = new TaskOperations(null, mContext, mSyncQueue);

        }
@@ -300,8 +296,7 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel { 
                        mMainHandler,

                        mBgExecutor,

                        mMainChoreographer,

                        mSyncQueue,

                        mWindowDecorViewHostSupplier);

                        mSyncQueue);

        mWindowDecorByTaskId.put(taskInfo.taskId, windowDecoration);



        final FluidResizeTaskPositioner taskPositioner =

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

+2 −5
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ import com.android.wm.shell.common.ShellExecutor; 
import com.android.wm.shell.common.SyncTransactionQueue;

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

import com.android.wm.shell.windowdecor.extension.TaskInfoKt;

import com.android.wm.shell.windowdecor.viewhost.WindowDecorViewHostSupplier;



/**

 * Defines visuals and behaviors of a window decoration of a caption bar and shadows. It works with
@@ -90,10 +89,8 @@ public class CaptionWindowDecoration extends WindowDecoration<WindowDecorLinearL 
            Handler handler,

            @ShellBackgroundThread ShellExecutor bgExecutor,

            Choreographer choreographer,

            SyncTransactionQueue syncQueue,

            WindowDecorViewHostSupplier windowDecorViewHostSupplier) {

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

                windowDecorViewHostSupplier);

            SyncTransactionQueue syncQueue) {

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

        mHandler = handler;

        mBgExecutor = bgExecutor;

        mChoreographer = choreographer;

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

+2 −9
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ import com.android.wm.shell.windowdecor.DesktopModeWindowDecoration.ExclusionReg 
import com.android.wm.shell.windowdecor.extension.InsetsStateKt;

import com.android.wm.shell.windowdecor.extension.TaskInfoKt;

import com.android.wm.shell.windowdecor.viewholder.AppHeaderViewHolder;

import com.android.wm.shell.windowdecor.viewhost.WindowDecorViewHostSupplier;



import kotlin.Pair;

import kotlin.Unit;
@@ -169,7 +168,6 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
    private final WindowDecorCaptionHandleRepository mWindowDecorCaptionHandleRepository;

    private final Optional<DesktopTasksLimiter> mDesktopTasksLimiter;

    private final AppHeaderViewHolder.Factory mAppHeaderViewHolderFactory;

    private final WindowDecorViewHostSupplier mWindowDecorViewHostSupplier;

    private boolean mTransitionDragActive;



    private SparseArray<EventReceiver> mEventReceiversByDisplay = new SparseArray<>();
@@ -239,8 +237,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
            MultiInstanceHelper multiInstanceHelper,

            Optional<DesktopTasksLimiter> desktopTasksLimiter,

            WindowDecorCaptionHandleRepository windowDecorCaptionHandleRepository,

            Optional<DesktopActivityOrientationChangeHandler> activityOrientationChangeHandler,

            WindowDecorViewHostSupplier windowDecorViewHostSupplier) {

            Optional<DesktopActivityOrientationChangeHandler> activityOrientationChangeHandler) {

        this(

                context,

                shellExecutor,
@@ -260,7 +257,6 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
                genericLinksParser,

                assistContentRequester,

                multiInstanceHelper,

                windowDecorViewHostSupplier,

                new DesktopModeWindowDecoration.Factory(),

                new InputMonitorFactory(),

                SurfaceControl.Transaction::new,
@@ -294,7 +290,6 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
            AppToWebGenericLinksParser genericLinksParser,

            AssistContentRequester assistContentRequester,

            MultiInstanceHelper multiInstanceHelper,

            WindowDecorViewHostSupplier windowDecorViewHostSupplier,

            DesktopModeWindowDecoration.Factory desktopModeWindowDecorFactory,

            InputMonitorFactory inputMonitorFactory,

            Supplier<SurfaceControl.Transaction> transactionFactory,
@@ -322,7 +317,6 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
        mMultiInstanceHelper = multiInstanceHelper;

        mShellCommandHandler = shellCommandHandler;

        mWindowManager = windowManager;

        mWindowDecorViewHostSupplier = windowDecorViewHostSupplier;

        mDesktopModeWindowDecorFactory = desktopModeWindowDecorFactory;

        mInputMonitorFactory = inputMonitorFactory;

        mTransactionFactory = transactionFactory;
@@ -1412,8 +1406,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
                        mGenericLinksParser,

                        mAssistContentRequester,

                        mMultiInstanceHelper,

                        mWindowDecorCaptionHandleRepository,

                        mWindowDecorViewHostSupplier);

                        mWindowDecorCaptionHandleRepository);

        mWindowDecorByTaskId.put(taskInfo.taskId, windowDecoration);



        final TaskPositioner taskPositioner = mTaskPositionerFactory.create(

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

+82 −20
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import static com.android.wm.shell.windowdecor.DragResizeWindowGeometry.getResiz 


import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SuppressLint;

import android.app.ActivityManager;

import android.app.WindowConfiguration.WindowingMode;

import android.app.assist.AssistContent;
@@ -98,7 +99,6 @@ import com.android.wm.shell.windowdecor.extension.TaskInfoKt; 
import com.android.wm.shell.windowdecor.viewholder.AppHandleViewHolder;

import com.android.wm.shell.windowdecor.viewholder.AppHeaderViewHolder;

import com.android.wm.shell.windowdecor.viewholder.WindowDecorationViewHolder;

import com.android.wm.shell.windowdecor.viewhost.WindowDecorViewHostSupplier;



import kotlin.Pair;

import kotlin.Unit;
@@ -144,9 +144,12 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
    private Function0<Unit> mOnManageWindowsClickListener;

    private DragPositioningCallback mDragPositioningCallback;

    private DragResizeInputListener mDragResizeListener;

    private Runnable mCurrentViewHostRunnable = null;

    private RelayoutParams mRelayoutParams = new RelayoutParams();

    private final WindowDecoration.RelayoutResult<WindowDecorLinearLayout> mResult =

            new WindowDecoration.RelayoutResult<>();

    private final Runnable mViewHostRunnable =

            () -> updateViewHost(mRelayoutParams, null /* onDrawTransaction */, mResult);



    private final Point mPositionInParent = new Point();

    private HandleMenu mHandleMenu;
@@ -203,8 +206,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
            AppToWebGenericLinksParser genericLinksParser,

            AssistContentRequester assistContentRequester,

            MultiInstanceHelper multiInstanceHelper,

            WindowDecorCaptionHandleRepository windowDecorCaptionHandleRepository,

            WindowDecorViewHostSupplier windowDecorViewHostSupplier) {

            WindowDecorCaptionHandleRepository windowDecorCaptionHandleRepository) {

        this (context, userContext, displayController, splitScreenController, taskOrganizer,

                taskInfo, taskSurface, handler, bgExecutor, choreographer, syncQueue,

                appHeaderViewHolderFactory, rootTaskDisplayAreaOrganizer, genericLinksParser,
@@ -212,7 +214,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
                SurfaceControl.Builder::new, SurfaceControl.Transaction::new,

                WindowContainerTransaction::new, SurfaceControl::new, new WindowManagerWrapper(

                        context.getSystemService(WindowManager.class)),

                new SurfaceControlViewHostFactory() {}, windowDecorViewHostSupplier,

                new SurfaceControlViewHostFactory() {},

                DefaultMaximizeMenuFactory.INSTANCE,

                DefaultHandleMenuFactory.INSTANCE, multiInstanceHelper,

                windowDecorCaptionHandleRepository);
@@ -240,7 +242,6 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
            Supplier<SurfaceControl> surfaceControlSupplier,

            WindowManagerWrapper windowManagerWrapper,

            SurfaceControlViewHostFactory surfaceControlViewHostFactory,

            WindowDecorViewHostSupplier windowDecorViewHostSupplier,

            MaximizeMenuFactory maximizeMenuFactory,

            HandleMenuFactory handleMenuFactory,

            MultiInstanceHelper multiInstanceHelper,
@@ -248,7 +249,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
        super(context, userContext, displayController, taskOrganizer, taskInfo, taskSurface,

                surfaceControlBuilderSupplier, surfaceControlTransactionSupplier,

                windowContainerTransactionSupplier, surfaceControlSupplier,

                surfaceControlViewHostFactory, windowDecorViewHostSupplier);

                surfaceControlViewHostFactory);

        mSplitScreenController = splitScreenController;

        mHandler = handler;

        mBgExecutor = bgExecutor;
@@ -362,6 +363,73 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
            SurfaceControl.Transaction startT, SurfaceControl.Transaction finishT,

            boolean applyStartTransactionOnDraw, boolean shouldSetTaskPositionAndCrop) {

        Trace.beginSection("DesktopModeWindowDecoration#relayout");

        if (taskInfo.isFreeform()) {

            // The Task is in Freeform mode -> show its header in sync since it's an integral part

            // of the window itself - a delayed header might cause bad UX.

            relayoutInSync(taskInfo, startT, finishT, applyStartTransactionOnDraw,

                    shouldSetTaskPositionAndCrop);

        } else {

            // The Task is outside Freeform mode -> allow the handle view to be delayed since the

            // handle is just a small addition to the window.

            relayoutWithDelayedViewHost(taskInfo, startT, finishT, applyStartTransactionOnDraw,

                    shouldSetTaskPositionAndCrop);

        }

        Trace.endSection();

    }



    /** Run the whole relayout phase immediately without delay. */

    private void relayoutInSync(ActivityManager.RunningTaskInfo taskInfo,

            SurfaceControl.Transaction startT, SurfaceControl.Transaction finishT,

            boolean applyStartTransactionOnDraw, boolean shouldSetTaskPositionAndCrop) {

        // Clear the current ViewHost runnable as we will update the ViewHost here

        clearCurrentViewHostRunnable();

        updateRelayoutParamsAndSurfaces(taskInfo, startT, finishT, applyStartTransactionOnDraw,

                shouldSetTaskPositionAndCrop);

        if (mResult.mRootView != null) {

            updateViewHost(mRelayoutParams, startT, mResult);

        }

    }



    /**

     * Clear the current ViewHost runnable - to ensure it doesn't run once relayout params have been

     * updated.

     */

    private void clearCurrentViewHostRunnable() {

        if (mCurrentViewHostRunnable != null) {

            mHandler.removeCallbacks(mCurrentViewHostRunnable);

            mCurrentViewHostRunnable = null;

        }

    }



    /**

     * Relayout the window decoration but repost some of the work, to unblock the current callstack.

     */

    private void relayoutWithDelayedViewHost(ActivityManager.RunningTaskInfo taskInfo,

            SurfaceControl.Transaction startT, SurfaceControl.Transaction finishT,

            boolean applyStartTransactionOnDraw, boolean shouldSetTaskPositionAndCrop) {

        if (applyStartTransactionOnDraw) {

            throw new IllegalArgumentException(

                    "We cannot both sync viewhost ondraw and delay viewhost creation.");

        }

        // Clear the current ViewHost runnable as we will update the ViewHost here

        clearCurrentViewHostRunnable();

        updateRelayoutParamsAndSurfaces(taskInfo, startT, finishT,

                false /* applyStartTransactionOnDraw */, shouldSetTaskPositionAndCrop);

        if (mResult.mRootView == null) {

            // This means something blocks the window decor from showing, e.g. the task is hidden.

            // Nothing is set up in this case including the decoration surface.

            return;

        }

        // Store the current runnable so it can be removed if we start a new relayout.

        mCurrentViewHostRunnable = mViewHostRunnable;

        mHandler.post(mCurrentViewHostRunnable);

    }



    @SuppressLint("MissingPermission")

    private void updateRelayoutParamsAndSurfaces(ActivityManager.RunningTaskInfo taskInfo,

            SurfaceControl.Transaction startT, SurfaceControl.Transaction finishT,

            boolean applyStartTransactionOnDraw, boolean shouldSetTaskPositionAndCrop) {

        Trace.beginSection("DesktopModeWindowDecoration#updateRelayoutParamsAndSurfaces");



        if (Flags.enableDesktopWindowingAppToWeb()) {

            setCapturedLink(taskInfo.capturedLink, taskInfo.capturedLinkTimestamp);
@@ -378,8 +446,8 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
        final SurfaceControl oldDecorationSurface = mDecorationContainerSurface;

        final WindowContainerTransaction wct = new WindowContainerTransaction();



        Trace.beginSection("DesktopModeWindowDecoration#relayout-inner");

        relayout(mRelayoutParams, startT, finishT, wct, oldRootView, mResult);

        Trace.beginSection("DesktopModeWindowDecoration#relayout-updateViewsAndSurfaces");

        updateViewsAndSurfaces(mRelayoutParams, startT, finishT, wct, oldRootView, mResult);

        Trace.endSection();

        // After this line, mTaskInfo is up-to-date and should be used instead of taskInfo
@@ -394,7 +462,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
                notifyNoCaptionHandle();

            }

            disposeStatusBarInputLayer();

            Trace.endSection(); // DesktopModeWindowDecoration#relayout

            Trace.endSection(); // DesktopModeWindowDecoration#updateRelayoutParamsAndSurfaces

            return;

        }
@@ -402,12 +470,12 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
            disposeStatusBarInputLayer();

            mWindowDecorViewHolder = createViewHolder();

        }

        Trace.beginSection("DesktopModeWindowDecoration#relayout-binding");



        final Point position = new Point();

        if (isAppHandle(mWindowDecorViewHolder)) {

            position.set(determineHandlePosition());

        }

        Trace.beginSection("DesktopModeWindowDecoration#relayout-bindData");

        if (canEnterDesktopMode(mContext) && Flags.enableDesktopWindowingAppHandleEducation()) {

            notifyCaptionStateChanged();

        }
@@ -425,7 +493,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
        }

        updateDragResizeListener(oldDecorationSurface);

        updateMaximizeMenu(startT);

        Trace.endSection(); // DesktopModeWindowDecoration#relayout

        Trace.endSection(); // DesktopModeWindowDecoration#updateRelayoutParamsAndSurfaces

    }



    private boolean isCaptionVisible() {
@@ -679,10 +747,6 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
        relayoutParams.mLayoutResId = captionLayoutId;

        relayoutParams.mCaptionHeightId = getCaptionHeightIdStatic(taskInfo.getWindowingMode());

        relayoutParams.mCaptionWidthId = getCaptionWidthId(relayoutParams.mLayoutResId);

        // Allow the handle view to be delayed since the handle is just a small addition to the

        // window, whereas the header cannot be delayed because it is expected to be visible from

        // the first frame.

        relayoutParams.mAsyncViewHost = isAppHandle;



        if (isAppHeader) {

            if (TaskInfoKt.isTransparentCaptionBarAppearance(taskInfo)) {
@@ -1365,10 +1429,10 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
        mExclusionRegionListener.onExclusionRegionDismissed(mTaskInfo.taskId);

        disposeResizeVeil();

        disposeStatusBarInputLayer();

        clearCurrentViewHostRunnable();

        if (canEnterDesktopMode(mContext) && Flags.enableDesktopWindowingAppHandleEducation()) {

            notifyNoCaptionHandle();

        }



        super.close();

    }
@@ -1479,8 +1543,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
                AppToWebGenericLinksParser genericLinksParser,

                AssistContentRequester assistContentRequester,

                MultiInstanceHelper multiInstanceHelper,

                WindowDecorCaptionHandleRepository windowDecorCaptionHandleRepository,

                WindowDecorViewHostSupplier windowDecorViewHostSupplier) {

                WindowDecorCaptionHandleRepository windowDecorCaptionHandleRepository) {

            return new DesktopModeWindowDecoration(

                    context,

                    userContext,
@@ -1498,8 +1561,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
                    genericLinksParser,

                    assistContentRequester,

                    multiInstanceHelper,

                    windowDecorCaptionHandleRepository,

                    windowDecorViewHostSupplier);

                    windowDecorCaptionHandleRepository);

        }

    }