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

Commit ce3460b1 authored by Jorge Gil's avatar Jorge Gil
Browse files

Apply the window decor transaction in sync with the View's draw 

When the window decoration needs to #relayout from an
onTaskInfoChanged() call (usually due to resizing), the
SC.Transaction that set the new task crop was applied at the same
time as the View's layout was scheduled to draw, which meant that
when the View is slow to draw, the new task size is visible on screen
before the caption View is visible, which looks like a flicker.

This change merges the transaction with the buffer transaction from
the view root using #applyTransactionOnDraw, so that both are visible
at the same time on screen.

Bug: 270202228
Test: atest WindowDecorationTests
Test: manual - drag resize a freeform task, no flickering around the
edge of the caption.

Change-Id: Iccdc0acdd9935b0a89759704b2e4426802f2b44a
parent 5d0a007f

core/java/android/view/SurfaceControlViewHost.java

+7 −0
Original line number Diff line number Diff line
@@ -406,6 +406,13 @@ public class SurfaceControlViewHost { 
        }

    }



    /**

     * @hide

     */

    public @NonNull AttachedSurfaceControl getRootSurfaceControl() {

        return mViewRoot;

    }



    /**

     * Set the root view of the SurfaceControlViewHost. This view will render in to

     * the SurfaceControl, and receive input based on the SurfaceControls positioning on

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

+4 −3
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel { 
        if (decoration == null) {

            createWindowDecoration(taskInfo, taskSurface, startT, finishT);

        } else {

            decoration.relayout(taskInfo, startT, finishT);

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

        }

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

        if (decoration == null) return;



        decoration.relayout(taskInfo, startT, finishT);

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

    }



    @Override
@@ -192,7 +192,8 @@ public class CaptionWindowDecorViewModel implements WindowDecorViewModel { 
        windowDecoration.setCaptionListeners(touchEventListener, touchEventListener);

        windowDecoration.setDragPositioningCallback(taskPositioner);

        windowDecoration.setDragDetector(touchEventListener.mDragDetector);

        windowDecoration.relayout(taskInfo, startT, finishT);

        windowDecoration.relayout(taskInfo, startT, finishT,

                false /* applyStartTransactionOnDraw */);

        setupCaptionColor(taskInfo, windowDecoration);

    }

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

+7 −6
Original line number Diff line number Diff line
@@ -90,15 +90,15 @@ public class CaptionWindowDecoration extends WindowDecoration<WindowDecorLinearL 
    @Override

    void relayout(RunningTaskInfo taskInfo) {

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

        relayout(taskInfo, t, t);

        mSyncQueue.runInSync(transaction -> {

            transaction.merge(t);

            t.close();

        });

        // 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 */);

    }



    void relayout(RunningTaskInfo taskInfo,

            SurfaceControl.Transaction startT, SurfaceControl.Transaction finishT) {

            SurfaceControl.Transaction startT, SurfaceControl.Transaction finishT,

            boolean applyStartTransactionOnDraw) {

        final int shadowRadiusID = taskInfo.isFocused

                ? R.dimen.freeform_decor_shadow_focused_thickness

                : R.dimen.freeform_decor_shadow_unfocused_thickness;
@@ -115,6 +115,7 @@ public class CaptionWindowDecoration extends WindowDecoration<WindowDecorLinearL 
        mRelayoutParams.mLayoutResId = R.layout.caption_window_decor;

        mRelayoutParams.mCaptionHeightId = R.dimen.freeform_decor_caption_height;

        mRelayoutParams.mShadowRadiusId = shadowRadiusID;

        mRelayoutParams.mApplyStartTransactionOnDraw = applyStartTransactionOnDraw;



        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

+4 −3
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
        if (decoration == null) {

            createWindowDecoration(taskInfo, taskSurface, startT, finishT);

        } else {

            decoration.relayout(taskInfo, startT, finishT);

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

        }

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

        if (decoration == null) return;



        decoration.relayout(taskInfo, startT, finishT);

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

    }



    @Override
@@ -780,7 +780,8 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 
        windowDecoration.setCaptionListeners(touchEventListener, touchEventListener);

        windowDecoration.setDragPositioningCallback(taskPositioner);

        windowDecoration.setDragDetector(touchEventListener.mDragDetector);

        windowDecoration.relayout(taskInfo, startT, finishT);

        windowDecoration.relayout(taskInfo, startT, finishT,

                false /* applyStartTransactionOnDraw */);

        incrementEventReceiverTasks(taskInfo.displayId);

    }

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

+7 −6
Original line number Diff line number Diff line
@@ -173,15 +173,15 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
    @Override

    void relayout(ActivityManager.RunningTaskInfo taskInfo) {

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

        relayout(taskInfo, t, t);

        mSyncQueue.runInSync(transaction -> {

            transaction.merge(t);

            t.close();

        });

        // 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 */);

    }



    void relayout(ActivityManager.RunningTaskInfo taskInfo,

            SurfaceControl.Transaction startT, SurfaceControl.Transaction finishT) {

            SurfaceControl.Transaction startT, SurfaceControl.Transaction finishT,

            boolean applyStartTransactionOnDraw) {

        final int shadowRadiusID = taskInfo.isFocused

                ? R.dimen.freeform_decor_shadow_focused_thickness

                : R.dimen.freeform_decor_shadow_unfocused_thickness;
@@ -216,6 +216,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
        mRelayoutParams.mLayoutResId = windowDecorLayoutId;

        mRelayoutParams.mCaptionHeightId = R.dimen.freeform_decor_caption_height;

        mRelayoutParams.mShadowRadiusId = shadowRadiusID;

        mRelayoutParams.mApplyStartTransactionOnDraw = applyStartTransactionOnDraw;



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

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