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

Commit 5973b832 authored by Merissa Mitchell's avatar Merissa Mitchell
Browse files

[PiP on Desktop] Don't start Transition to update inset if wct is empty. 

This is a follow-up to I3e17a0ac4c030fae0f3f0003218e1342334465a2, which
caused a performance regression. This CL updates the previous CL to only
start a Transition if the wct is not empty.

Bug: 411269706
Test: atest DesktopModeWindowDecorationTests
Flag: com.android.window.flags.enable_desktop_windowing_pip
Change-Id: I354138cc55dff49b470cd80773e5a959b37fb4cb
parent 8007ae53

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

+15 −13
Original line number Diff line number Diff line
@@ -570,20 +570,22 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
        relayout(mRelayoutParams, startT, finishT, wct, oldRootView, mResult);

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



        if (!wct.isEmpty()) {

            if (DesktopExperienceFlags.ENABLE_DESKTOP_WINDOWING_PIP.isTrue()

                    && mRelayoutParams.mShouldSetAppBounds) {

            // When expanding from PiP to freeform, we need to start a Transition for applying the

            // inset changes so that PiP receives the insets for the final bounds. This is because

            // |mShouldSetAppBounds| applies the insets by modifying app bounds, which can cause a

            // bounds offset that needs to be reported to transition handlers.

                // When expanding from PiP to freeform, we need to start a Transition for applying

                // the inset changes so that PiP receives the insets for the final bounds. This is

                // because |mShouldSetAppBounds| applies the insets by modifying app bounds, which

                // can cause a bounds offset that needs to be reported to transition handlers.

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

            mHandler.post(

                    () -> mTransitions.startTransition(TRANSIT_CHANGE, wct, /* handler= */ null));

                mHandler.post(() -> mTransitions.startTransition(TRANSIT_CHANGE, wct,

                        /* handler= */ null));

            } else {

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

                mBgExecutor.execute(() -> mTaskOrganizer.applyTransaction(wct));

            }

            Trace.endSection();

        }



        if (mResult.mRootView == null) {

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