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

Commit 9d8d53f4 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Set correct screenBounds for RemoteAnimation" into rvc-dev am:... 

Merge "Merge "Set correct screenBounds for RemoteAnimation" into rvc-dev am: 3d9abd8b am: b54965cc am: 439104fc" into rvc-qpr-dev-plus-aosp am: d79bdaf0

Change-Id: I96e9a5e9879de6c8351e63d550d8fa37385066d9
parents 48245fcb d79bdaf0

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

+3 −2
Original line number Diff line number Diff line
@@ -2184,7 +2184,8 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
        final int appStackClipMode = getDisplayContent().mAppTransition.getAppStackClipMode();



        // Separate position and size for use in animators.

        mTmpRect.set(getAnimationBounds(appStackClipMode));

        final Rect screenBounds = getAnimationBounds(appStackClipMode);

        mTmpRect.set(screenBounds);

        getAnimationPosition(mTmpPoint);

        if (!sHierarchicalAnimations) {

            // Non-hierarchical animation uses position in global coordinates.
@@ -2203,7 +2204,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
            localBounds.offsetTo(mTmpPoint.x, mTmpPoint.y);

            final RemoteAnimationController.RemoteAnimationRecord adapters =

                    controller.createRemoteAnimationRecord(this, mTmpPoint, localBounds,

                            mTmpRect, (isChanging ? mSurfaceFreezer.mFreezeBounds : null));

                            screenBounds, (isChanging ? mSurfaceFreezer.mFreezeBounds : null));

            resultAdapters = new Pair<>(adapters.mAdapter, adapters.mThumbnailAdapter);

        } else if (isChanging) {

            final float durationScale = mWmService.getTransitionAnimationScaleLocked();