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

Commit 849eaa9d authored by Maryam Dehaini's avatar Maryam Dehaini Committed by Android (Google) Code Review
Browse files

Merge "Only set window crop and position in relayout when fluid drag resizing" into main

parents 9bc9dc71 2c0d7b41

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

+2 −1
Original line number Diff line number Diff line
@@ -235,7 +235,8 @@ public abstract class WMShellModule { 
                mainChoreographer,

                taskOrganizer,

                displayController,

                syncQueue);

                syncQueue,

                transitions);

    }



    //

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

+15 −9
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel { 
    private final Choreographer mMainChoreographer;

    private final DisplayController mDisplayController;

    private final SyncTransactionQueue mSyncQueue;

    private final Transitions mTransitions;

    private TaskOperations mTaskOperations;



    private final SparseArray<CaptionWindowDecoration> mWindowDecorByTaskId = new SparseArray<>();
@@ -64,13 +65,15 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel { 
            Choreographer mainChoreographer,

            ShellTaskOrganizer taskOrganizer,

            DisplayController displayController,

            SyncTransactionQueue syncQueue) {

            SyncTransactionQueue syncQueue,

            Transitions transitions) {

        mContext = context;

        mMainHandler = mainHandler;

        mMainChoreographer = mainChoreographer;

        mTaskOrganizer = taskOrganizer;

        mDisplayController = displayController;

        mSyncQueue = syncQueue;

        mTransitions = transitions;

        if (!Transitions.ENABLE_SHELL_TRANSITIONS) {

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

        }
@@ -133,7 +136,8 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel { 
        if (decoration == null) {

            createWindowDecoration(taskInfo, taskSurface, startT, finishT);

        } else {

            decoration.relayout(taskInfo, startT, finishT, false /* applyStartTransactionOnDraw */);

            decoration.relayout(taskInfo, startT, finishT, false /* applyStartTransactionOnDraw */,

                    false /* setTaskCropAndPosition */);

        }

    }
@@ -145,7 +149,8 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel { 
        final CaptionWindowDecoration decoration = mWindowDecorByTaskId.get(taskInfo.taskId);

        if (decoration == null) return;



        decoration.relayout(taskInfo, startT, finishT, false /* applyStartTransactionOnDraw */);

        decoration.relayout(taskInfo, startT, finishT, false /* applyStartTransactionOnDraw */,

                false /* setTaskCropAndPosition */);

    }



    @Override
@@ -191,16 +196,17 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel { 
                        mSyncQueue);

        mWindowDecorByTaskId.put(taskInfo.taskId, windowDecoration);



        final DragPositioningCallback dragPositioningCallback =

                new FluidResizeTaskPositioner(mTaskOrganizer, windowDecoration, mDisplayController,

                        0 /* disallowedAreaForEndBoundsHeight */);

        final FluidResizeTaskPositioner taskPositioner =

                new FluidResizeTaskPositioner(mTaskOrganizer, mTransitions, windowDecoration,

                        mDisplayController, 0 /* disallowedAreaForEndBoundsHeight */);

        final CaptionTouchEventListener touchEventListener =

                new CaptionTouchEventListener(taskInfo, dragPositioningCallback);

                new CaptionTouchEventListener(taskInfo, taskPositioner);

        windowDecoration.setCaptionListeners(touchEventListener, touchEventListener);

        windowDecoration.setDragPositioningCallback(dragPositioningCallback);

        windowDecoration.setDragPositioningCallback(taskPositioner);

        windowDecoration.setDragDetector(touchEventListener.mDragDetector);

        windowDecoration.setTaskDragResizer(taskPositioner);

        windowDecoration.relayout(taskInfo, startT, finishT,

                false /* applyStartTransactionOnDraw */);

                false /* applyStartTransactionOnDraw */, false /* setTaskCropAndPosition */);

        setupCaptionColor(taskInfo, windowDecoration);

    }

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

+9 −2
Original line number Diff line number Diff line
@@ -157,15 +157,21 @@ public class CaptionWindowDecoration extends WindowDecoration<WindowDecorLinearL 
    @Override

    void relayout(RunningTaskInfo taskInfo) {

        final SurfaceControl.Transaction t = new SurfaceControl.Transaction();

        // The crop and position of the task should only be set when a task is fluid resizing. In

        // all other cases, it is expected that the transition handler positions and crops the task

        // in order to allow the handler time to animate before the task before the final

        // position and crop are set.

        final boolean shouldSetTaskPositionAndCrop = mTaskDragResizer.isResizingOrAnimating();

        // Use |applyStartTransactionOnDraw| so that the transaction (that applies task crop) is

        // synced with the buffer transaction (that draws the View). Both will be shown on screen

        // at the same, whereas applying them independently causes flickering. See b/270202228.

        relayout(taskInfo, t, t, true /* applyStartTransactionOnDraw */);

        relayout(taskInfo, t, t, true /* applyStartTransactionOnDraw */,

                shouldSetTaskPositionAndCrop);

    }



    void relayout(RunningTaskInfo taskInfo,

            SurfaceControl.Transaction startT, SurfaceControl.Transaction finishT,

            boolean applyStartTransactionOnDraw) {

            boolean applyStartTransactionOnDraw, boolean setTaskCropAndPosition) {

        final int shadowRadiusID = taskInfo.isFocused

                ? R.dimen.freeform_decor_shadow_focused_thickness

                : R.dimen.freeform_decor_shadow_unfocused_thickness;
@@ -183,6 +189,7 @@ public class CaptionWindowDecoration extends WindowDecoration<WindowDecorLinearL 
        mRelayoutParams.mCaptionHeightId = getCaptionHeightId(taskInfo.getWindowingMode());

        mRelayoutParams.mShadowRadiusId = shadowRadiusID;

        mRelayoutParams.mApplyStartTransactionOnDraw = applyStartTransactionOnDraw;

        mRelayoutParams.mSetTaskPositionAndCrop = setTaskCropAndPosition;



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

        // After this line, mTaskInfo is up-to-date and should be used instead of taskInfo

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

+22 −20
Original line number Diff line number Diff line
@@ -335,7 +335,8 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
        if (decoration == null) {

            createWindowDecoration(taskInfo, taskSurface, startT, finishT);

        } else {

            decoration.relayout(taskInfo, startT, finishT, false /* applyStartTransactionOnDraw */);

            decoration.relayout(taskInfo, startT, finishT, false /* applyStartTransactionOnDraw */,

                    false /* shouldSetTaskPositionAndCrop */);

        }

    }
@@ -347,7 +348,8 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
        final DesktopModeWindowDecoration decoration = mWindowDecorByTaskId.get(taskInfo.taskId);

        if (decoration == null) return;



        decoration.relayout(taskInfo, startT, finishT, false /* applyStartTransactionOnDraw */);

        decoration.relayout(taskInfo, startT, finishT, false /* applyStartTransactionOnDraw */,

                false /* shouldSetTaskPositionAndCrop */);

    }



    @Override
@@ -1010,8 +1012,23 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
        mWindowDecorByTaskId.put(taskInfo.taskId, windowDecoration);

        windowDecoration.createResizeVeil();



        final DragPositioningCallback dragPositioningCallback = createDragPositioningCallback(

                windowDecoration);

        final DragPositioningCallback dragPositioningCallback;

        final int transitionAreaHeight = mContext.getResources().getDimensionPixelSize(

                R.dimen.desktop_mode_transition_area_height);

        if (!DesktopModeStatus.isVeiledResizeEnabled()) {

            dragPositioningCallback =  new FluidResizeTaskPositioner(

                    mTaskOrganizer, mTransitions, windowDecoration, mDisplayController,

                    mDragStartListener, mTransactionFactory, transitionAreaHeight);

            windowDecoration.setTaskDragResizer(

                    (FluidResizeTaskPositioner) dragPositioningCallback);

        } else {

            dragPositioningCallback =  new VeiledResizeTaskPositioner(

                    mTaskOrganizer, windowDecoration, mDisplayController,

                    mDragStartListener, mTransitions, transitionAreaHeight);

            windowDecoration.setTaskDragResizer(

                    (VeiledResizeTaskPositioner) dragPositioningCallback);

        }



        final DesktopModeTouchEventListener touchEventListener =

                new DesktopModeTouchEventListener(taskInfo, dragPositioningCallback);
@@ -1021,23 +1038,9 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
        windowDecoration.setDragPositioningCallback(dragPositioningCallback);

        windowDecoration.setDragDetector(touchEventListener.mDragDetector);

        windowDecoration.relayout(taskInfo, startT, finishT,

                false /* applyStartTransactionOnDraw */);

                false /* applyStartTransactionOnDraw */, false /* shouldSetTaskPositionAndCrop */);

        incrementEventReceiverTasks(taskInfo.displayId);

    }

    private DragPositioningCallback createDragPositioningCallback(

            @NonNull DesktopModeWindowDecoration windowDecoration) {

        final int transitionAreaHeight = mContext.getResources().getDimensionPixelSize(

                R.dimen.desktop_mode_transition_area_height);

        if (!DesktopModeStatus.isVeiledResizeEnabled()) {

            return new FluidResizeTaskPositioner(mTaskOrganizer, windowDecoration,

                    mDisplayController, mDragStartListener, mTransactionFactory,

                    transitionAreaHeight);

        } else {

            return new VeiledResizeTaskPositioner(mTaskOrganizer, windowDecoration,

                    mDisplayController, mDragStartListener, mTransitions,

                    transitionAreaHeight);

        }

    }



    private RunningTaskInfo getOtherSplitTask(int taskId) {

        @SplitPosition int remainingTaskPosition = mSplitScreenController
@@ -1138,7 +1141,6 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
            }

        }

    }



}

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

+14 −4
Original line number Diff line number Diff line
@@ -187,20 +187,28 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
        }



        final SurfaceControl.Transaction t = mSurfaceControlTransactionSupplier.get();

        // The crop and position of the task should only be set when a task is fluid resizing. In

        // all other cases, it is expected that the transition handler positions and crops the task

        // in order to allow the handler time to animate before the task before the final

        // position and crop are set.

        final boolean shouldSetTaskPositionAndCrop = !DesktopModeStatus.isVeiledResizeEnabled()

                && mTaskDragResizer.isResizingOrAnimating();

        // Use |applyStartTransactionOnDraw| so that the transaction (that applies task crop) is

        // synced with the buffer transaction (that draws the View). Both will be shown on screen

        // at the same, whereas applying them independently causes flickering. See b/270202228.

        relayout(taskInfo, t, t, true /* applyStartTransactionOnDraw */);

        relayout(taskInfo, t, t, true /* applyStartTransactionOnDraw */,

                shouldSetTaskPositionAndCrop);

    }



    void relayout(ActivityManager.RunningTaskInfo taskInfo,

            SurfaceControl.Transaction startT, SurfaceControl.Transaction finishT,

            boolean applyStartTransactionOnDraw) {

            boolean applyStartTransactionOnDraw, boolean shouldSetTaskPositionAndCrop) {

        if (isHandleMenuActive()) {

            mHandleMenu.relayout(startT);

        }



        updateRelayoutParams(mRelayoutParams, mContext, taskInfo, applyStartTransactionOnDraw);

        updateRelayoutParams(mRelayoutParams, mContext, taskInfo, applyStartTransactionOnDraw,

                shouldSetTaskPositionAndCrop);



        final WindowDecorLinearLayout oldRootView = mResult.mRootView;

        final SurfaceControl oldDecorationSurface = mDecorationContainerSurface;
@@ -302,7 +310,8 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
            RelayoutParams relayoutParams,

            Context context,

            ActivityManager.RunningTaskInfo taskInfo,

            boolean applyStartTransactionOnDraw) {

            boolean applyStartTransactionOnDraw,

            boolean shouldSetTaskPositionAndCrop) {

        relayoutParams.reset();

        relayoutParams.mRunningTaskInfo = taskInfo;

        relayoutParams.mLayoutResId =
@@ -314,6 +323,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
                    : R.dimen.freeform_decor_shadow_unfocused_thickness;

        }

        relayoutParams.mApplyStartTransactionOnDraw = applyStartTransactionOnDraw;

        relayoutParams.mSetTaskPositionAndCrop = shouldSetTaskPositionAndCrop;

        // The configuration used to lay out the window decoration. The system context's config is

        // used when the task density has been overridden to a custom density so that the resources

        // and views of the decoration aren't affected and match the rest of the System UI, if not