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

Commit c3094842 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Android (Google) Code Review
Browse files

Merge changes I9bf357f3,Ia83b74fc

* changes:
  Revert "Call prepareSurfaces in applySurfacesChangesTransaction"
  Revert "Revert "Revert "Avoid setting size/position on Transaction if not needed"""
parents c7107018 ee250367
Loading
Loading
Loading
Loading
+34 −2
Original line number Diff line number Diff line
@@ -335,6 +335,9 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
            new TaskForResizePointSearchResult();
    private final ApplySurfaceChangesTransactionState mTmpApplySurfaceChangesTransactionState =
            new ApplySurfaceChangesTransactionState();
    private final ScreenshotApplicationState mScreenshotApplicationState =
            new ScreenshotApplicationState();
    private final Transaction mTmpTransaction = new Transaction();

    // True if this display is in the process of being removed. Used to determine if the removal of
    // the display's direct children should be allowed.
@@ -651,7 +654,10 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
            mWallpaperController.updateWallpaperVisibility();
        }

        w.handleWindowMovedIfNeeded(mPendingTransaction);
        // Use mTmpTransaction instead of mPendingTransaction because we don't want to commit
        // other changes in mPendingTransaction at this point.
        w.handleWindowMovedIfNeeded(mTmpTransaction);
        SurfaceControl.mergeToGlobalTransaction(mTmpTransaction);

        final WindowStateAnimator winAnimator = w.mWinAnimator;

@@ -686,6 +692,33 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
                    }
                }
            }
            final TaskStack stack = w.getStack();
            if (!winAnimator.isWaitingForOpening()
                    || (stack != null && stack.isAnimatingBounds())) {
                // Updates the shown frame before we set up the surface. This is needed
                // because the resizing could change the top-left position (in addition to
                // size) of the window. setSurfaceBoundariesLocked uses mShownPosition to
                // position the surface.
                //
                // If an animation is being started, we can't call this method because the
                // animation hasn't processed its initial transformation yet, but in general
                // we do want to update the position if the window is animating. We make an exception
                // for the bounds animating state, where an application may have been waiting
                // for an exit animation to start, but instead enters PiP. We need to ensure
                // we always recompute the top-left in this case.
                winAnimator.computeShownFrameLocked();
            }
            winAnimator.setSurfaceBoundariesLocked(mTmpRecoveringMemory /* recoveringMemory */);

            // Since setSurfaceBoundariesLocked applies the clipping, we need to apply the position
            // to the surface of the window container and also the position of the stack window
            // container as well. Use mTmpTransaction instead of mPendingTransaction to avoid
            // committing any existing changes in there.
            w.updateSurfacePosition(mTmpTransaction);
            if (stack != null) {
                stack.updateSurfaceBounds(mTmpTransaction);
            }
            SurfaceControl.mergeToGlobalTransaction(mTmpTransaction);
        }

        final AppWindowToken atoken = w.mAppToken;
@@ -2788,7 +2821,6 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo

        mTmpRecoveringMemory = recoveringMemory;
        forAllWindows(mApplySurfaceChangesTransaction, true /* traverseTopToBottom */);
        prepareSurfaces();

        mService.mDisplayManagerInternal.setDisplayProperties(mDisplayId,
                mTmpApplySurfaceChangesTransactionState.displayHasContent,
+1 −9
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ import static com.android.server.wm.proto.StackProto.WINDOW_CONTAINER;

import android.annotation.CallSuper;
import android.content.res.Configuration;
import android.graphics.Point;
import android.graphics.Rect;
import android.graphics.Region;
import android.os.RemoteException;
@@ -146,7 +145,6 @@ public class TaskStack extends WindowContainer<Task> implements
     * For {@link #prepareSurfaces}.
     */
    final Rect mTmpDimBoundsRect = new Rect();
    private final Point mLastSurfaceSize = new Point();

    TaskStack(WindowManagerService service, int stackId, StackWindowController controller) {
        super(service);
@@ -746,13 +744,7 @@ public class TaskStack extends WindowContainer<Task> implements
        }

        final Rect stackBounds = getBounds();
        final int width = stackBounds.width();
        final int height = stackBounds.height();
        if (width == mLastSurfaceSize.x && height == mLastSurfaceSize.y) {
            return;
        }
        transaction.setSize(mSurfaceControl, width, height);
        mLastSurfaceSize.set(width, height);
        transaction.setSize(mSurfaceControl, stackBounds.width(), stackBounds.height());
    }

    @Override
+0 −6
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
    protected final WindowManagerService mService;

    private final Point mTmpPos = new Point();
    protected final Point mLastSurfacePosition = new Point();

    /** Total number of elements in this subtree, including our own hierarchy element. */
    private int mTreeWeight = 1;
@@ -1179,12 +1178,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
        }

        getRelativePosition(mTmpPos);
        if (mTmpPos.equals(mLastSurfacePosition)) {
            return;
        }

        transaction.setPosition(mSurfaceControl, mTmpPos.x, mTmpPos.y);
        mLastSurfacePosition.set(mTmpPos.x, mTmpPos.y);

        for (int i = mChildren.size() - 1; i >= 0; i--) {
            mChildren.get(i).updateSurfacePosition(transaction);
+1 −3
Original line number Diff line number Diff line
@@ -4487,7 +4487,6 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP

        // Leash is now responsible for position, so set our position to 0.
        t.setPosition(mSurfaceControl, 0, 0);
        mLastSurfacePosition.set(0, 0);
    }

    @Override
@@ -4503,9 +4502,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
        }

        transformFrameToSurfacePosition(mFrame.left, mFrame.top, mSurfacePosition);
        if (!mSurfaceAnimator.hasLeash() && !mLastSurfacePosition.equals(mSurfacePosition)) {
        if (!mSurfaceAnimator.hasLeash()) {
            t.setPosition(mSurfaceControl, mSurfacePosition.x, mSurfacePosition.y);
            mLastSurfacePosition.set(mSurfacePosition.x, mSurfacePosition.y);
        }
    }