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

Commit 163c2dc2 authored by Evan Rosky's avatar Evan Rosky Committed by Android (Google) Code Review
Browse files

Merge "Defer sub-activity layout while sub-activity cfg is deferred" into main

parents c28c4cfb f0c5e235

libs/WindowManager/Shell/src/com/android/wm/shell/pip2/phone/PipScheduler.java

+0 −7
Original line number Diff line number Diff line
@@ -202,13 +202,6 @@ public class PipScheduler implements PipTransitionState.PipTransitionStateChange 
        WindowContainerTransaction wct = new WindowContainerTransaction();

        if (configAtEnd) {

            wct.deferConfigToTransitionEnd(pipTaskToken);



            if (mPipBoundsState.getBounds().width() == toBounds.width()

                    && mPipBoundsState.getBounds().height() == toBounds.height()) {

                // TODO (b/393159816): Config-at-End causes a flicker without size change.

                // If PiP size isn't changing enforce a minimal one-pixel change as a workaround.

                --toBounds.bottom;

            }

        }

        wct.setBounds(pipTaskToken, toBounds);

        mPipTransitionController.startPipBoundsChangeTransition(wct, duration);

services/core/java/com/android/server/wm/ActivityRecord.java

+6 −0
Original line number Diff line number Diff line
@@ -8309,6 +8309,12 @@ final class ActivityRecord extends WindowToken { 
        }

        for (int i = getChildCount() - 1; i >= 0; --i) {

            dispatchConfigurationToChild(getChildAt(i), getConfiguration());

            final WindowState ws = getChildAt(i).asWindowState();

            if (ws != null) {

                getDisplayContent().getDisplayPolicy().layoutWindowLw(ws, null /* attached */,

                        getDisplayContent().mDisplayFrames);

                ws.updateSurfacePositionNonOrganized();

            }

        }

        updateReportedConfigurationAndSend();

        return true;

services/core/java/com/android/server/wm/WindowState.java

+2 −1
Original line number Diff line number Diff line
@@ -1225,7 +1225,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 


    boolean skipLayout() {

        // Skip layout of the window when in transition to pip mode.

        return mActivityRecord != null && mActivityRecord.mWaitForEnteringPinnedMode;

        return mActivityRecord != null && (mActivityRecord.mWaitForEnteringPinnedMode

                || mActivityRecord.isConfigurationDispatchPaused());

    }



    void setFrames(ClientWindowFrames clientWindowFrames, int requestedWidth, int requestedHeight) {