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

Commit aaa332e7 authored by Ming-Shin Lu's avatar Ming-Shin Lu Committed by Automerger Merge Worker
Browse files

Merge "Fix ActivityRecord#attachCrossProfileAppsThumbnailAnimation issue" into... 

Merge "Fix ActivityRecord#attachCrossProfileAppsThumbnailAnimation issue" into rvc-dev am: dca10f7c

Change-Id: I3d129e10f27887d40320387ad929970973558d7f
parents a30354cb dca10f7c

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

+4 −4
Original line number Diff line number Diff line
@@ -5936,7 +5936,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        if (win == null) {

            return;

        }

        final Rect frame = win.getFrameLw();

        final Rect frame = win.getRelativeFrameLw();

        final int thumbnailDrawableRes = task.mUserId == mWmService.mCurrentUserId

                ? R.drawable.ic_account_circle

                : R.drawable.ic_corp_badge;
@@ -5946,12 +5946,12 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        if (thumbnail == null) {

            return;

        }

        final Transaction transaction = getAnimatingContainer().getPendingTransaction();

        final Transaction transaction = getPendingTransaction();

        mThumbnail = new WindowContainerThumbnail(mWmService.mSurfaceFactory,

                transaction, getAnimatingContainer(), thumbnail);

                transaction, getTask(), thumbnail);

        final Animation animation =

                getDisplayContent().mAppTransition.createCrossProfileAppsThumbnailAnimationLocked(

                        win.getFrameLw());

                        frame);

        mThumbnail.startAnimation(transaction, animation, new Point(frame.left, frame.top));

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ class WindowContainerThumbnail implements Animatable { 
        // TODO: This should be attached as a child to the app token, once the thumbnail animations

        // use relative coordinates. Once we start animating task we can also consider attaching

        // this to the task.

        mSurfaceControl = mWindowContainer.makeSurface()

        mSurfaceControl = mWindowContainer.makeChildSurface(mWindowContainer.getTopChild())

                .setName("thumbnail anim: " + mWindowContainer.toString())

                .setBufferSize(mWidth, mHeight)

                .setFormat(PixelFormat.TRANSLUCENT)
@@ -209,7 +209,7 @@ class WindowContainerThumbnail implements Animatable { 


    @Override

    public Builder makeAnimationLeash() {

        return mWindowContainer.makeSurface();

        return mWindowContainer.makeChildSurface(mWindowContainer.getTopChild());

    }



    @Override